Stefan Fiedler:

package/public/xpdf/freetype-update.patch.xpdf

@@ -1,41 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/rene/xpdf/freetype-update.patch.xpdf
-# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- ./configure.in.orig	2004-12-23 14:03:29.000000000 +0100
-+++ ./configure.in	2004-12-23 14:03:44.000000000 +0100
-@@ -309,7 +309,7 @@
-               FT_Get_Name_Index, freetype/freetype.h, -lm)
- if test x"$freetype2_LIBS" = x; then
-   smr_CHECK_LIB(freetype2, freetype, [FreeType2 font rasterizer - version 2.0.5+],
--                FT_Get_Name_Index, freetype.h, -lm)
-+                FT_Get_Name_Index, ft2build.h, -lm)
- fi
- AC_SUBST(freetype2_LIBS)
- AC_SUBST(freetype2_CFLAGS)
---- ./configure.orig	2004-12-23 14:03:22.000000000 +0100
-+++ ./configure	2004-12-23 14:04:51.434172736 +0100
-@@ -9460,7 +9460,7 @@
-   CPPFLAGS="$CPPFLAGS $freetype2_CFLAGS "
- 
- 
--for ac_header in freetype.h
-+for ac_header in ft2build.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then

package/public/xpdf/ps.patch.t1lib

@@ -1,30 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/rene/xpdf/ps.patch.t1lib
-# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- T1Lib-1.3/doc/Makefile.in.old	Sat Feb  9 02:07:38 2002
-+++ T1Lib-1.3/doc/Makefile.in	Sat Feb  9 02:12:32 2002
-@@ -74,7 +74,7 @@
- 
- 
- t1lib_doc.ps: t1lib_doc.dvi
--	      dvips t1lib_doc
-+	      dvips -o t1lib_doc.ps t1lib_doc
- 
- 
- pdf: t1lib_doc.tex intro.tex getstart.tex xglyph.tex ut1lib.tex xinterface.tex internals.tex type1afm.tex

package/public/xpdf/t1lib-texfixes.patch.t1lib

@@ -1,25 +0,0 @@
---- T1Lib-1.3/doc/t1lib_doc.tex.orig	2005-03-06 10:37:17.237711504 +0100
-+++ T1Lib-1.3/doc/t1lib_doc.tex	2005-03-06 10:39:43.203521328 +0100
-@@ -33,15 +33,15 @@
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %% Added by NGUYEN-DAI Quy and edited by RMz)
- %%
--\ifx\pdfoutput\undefined
-+%\ifx\pdfoutput\undefined
-   \usepackage[dvips]{graphicx}
- %  \usepackage[dvips,a4paper,breaklinks]{hyperref}
--\else
--  \usepackage[pdftex]{graphicx}
--  \usepackage[pdftex,a4paper,pageanchor,hyperfigures,breaklinks,%
--              colorlinks,citecolor=blue,urlcolor=red,linkcolor=magenta]{hyperref}
--  \pdfcompresslevel=9
--\fi
-+%\else
-+%  \usepackage[pdftex]{graphicx}
-+%  \usepackage[pdftex,a4paper,pageanchor,hyperfigures,breaklinks,%
-+%              colorlinks,citecolor=blue,urlcolor=red,linkcolor=magenta]{hyperref}
-+%  \pdfcompresslevel=9
-+%\fi
- \setcounter{tocdepth}{3}
- \setcounter{secnumdepth}{3}
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

package/public/xpdf/xpdf-3.00pl1-overflowfix.patch.xpdf

@@ -1,250 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/rene/xpdf/xpdf-3.00pl1-overflowfix.patch.xpdf
-# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- ./xpdf/XRef.cc.orig	2004-11-24 15:01:16.444656632 +0100
-+++ ./xpdf/XRef.cc	2004-11-24 15:00:57.007611512 +0100
-@@ -96,7 +96,7 @@
-   }
-   nObjects = obj1.getInt();
-   obj1.free();
--  if (nObjects == 0) {
-+  if (nObjects <= 0) {
-     goto err1;
-   }
- 
-@@ -106,6 +106,9 @@
-   }
-   first = obj1.getInt();
-   obj1.free();
-+  if (first < 0) {
-+    goto err1;
-+  }
- 
-   objs = new Object[nObjects];
-   objNums = (int *)gmalloc(nObjects * sizeof(int));
-@@ -130,6 +133,12 @@
-     offsets[i] = obj2.getInt();
-     obj1.free();
-     obj2.free();
-+    if (objNums[i] < 0 || offsets[i] < 0 ||
-+	(i > 0 && offsets[i] < offsets[i-1])) {
-+      delete parser;
-+      gfree(offsets);
-+      goto err1;
-+    }
-   }
-   while (str->getChar() != EOF) ;
-   delete parser;
-@@ -369,10 +378,16 @@
-     }
-     n = obj.getInt();
-     obj.free();
-+    if (first < 0 || n < 0 || first + n < 0) {
-+      goto err1;
-+    }
-     if (first + n > size) {
-       for (newSize = size ? 2 * size : 1024;
--	   first + n > newSize;
-+	   first + n > newSize && newSize > 0;
- 	   newSize <<= 1) ;
-+      if (newSize < 0) {
-+	goto err1;
-+      }
-       entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry));
-       for (i = size; i < newSize; ++i) {
- 	entries[i].offset = 0xffffffff;
-@@ -443,7 +458,7 @@
- 
-   // check for an 'XRefStm' key
-   if (obj.getDict()->lookup("XRefStm", &obj2)->isInt()) {
--    pos2 = obj2.getInt();
-+    pos2 = (Guint)obj2.getInt();
-     readXRef(&pos2);
-     if (!ok) {
-       goto err1;
-@@ -474,6 +489,9 @@
-   }
-   newSize = obj.getInt();
-   obj.free();
-+  if (newSize < 0) {
-+    goto err1;
-+  }
-   if (newSize > size) {
-     entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry));
-     for (i = size; i < newSize; ++i) {
-@@ -494,6 +512,9 @@
-     }
-     w[i] = obj2.getInt();
-     obj2.free();
-+    if (w[i] < 0 || w[i] > 4) {
-+      goto err1;
-+    }
-   }
-   obj.free();
- 
-@@ -513,13 +534,14 @@
-       }
-       n = obj.getInt();
-       obj.free();
--      if (!readXRefStreamSection(xrefStr, w, first, n)) {
-+      if (first < 0 || n < 0 ||
-+	  !readXRefStreamSection(xrefStr, w, first, n)) {
- 	idx.free();
- 	goto err0;
-       }
-     }
-   } else {
--    if (!readXRefStreamSection(xrefStr, w, 0, size)) {
-+    if (!readXRefStreamSection(xrefStr, w, 0, newSize)) {
-       idx.free();
-       goto err0;
-     }
-@@ -551,10 +573,16 @@
-   Guint offset;
-   int type, gen, c, newSize, i, j;
- 
-+  if (first + n < 0) {
-+    return gFalse;
-+  }
-   if (first + n > size) {
-     for (newSize = size ? 2 * size : 1024;
--	 first + n > newSize;
-+	 first + n > newSize && newSize > 0;
- 	 newSize <<= 1) ;
-+    if (newSize < 0) {
-+      return gFalse;
-+    }
-     entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry));
-     for (i = size; i < newSize; ++i) {
-       entries[i].offset = 0xffffffff;
-@@ -585,24 +613,26 @@
-       }
-       gen = (gen << 8) + c;
-     }
--    switch (type) {
--    case 0:
--      entries[i].offset = offset;
--      entries[i].gen = gen;
--      entries[i].type = xrefEntryFree;
--      break;
--    case 1:
--      entries[i].offset = offset;
--      entries[i].gen = gen;
--      entries[i].type = xrefEntryUncompressed;
--      break;
--    case 2:
--      entries[i].offset = offset;
--      entries[i].gen = gen;
--      entries[i].type = xrefEntryCompressed;
--      break;
--    default:
--      return gFalse;
-+    if (entries[i].offset == 0xffffffff) {
-+      switch (type) {
-+      case 0:
-+	entries[i].offset = offset;
-+	entries[i].gen = gen;
-+	entries[i].type = xrefEntryFree;
-+	break;
-+      case 1:
-+	entries[i].offset = offset;
-+	entries[i].gen = gen;
-+	entries[i].type = xrefEntryUncompressed;
-+	break;
-+      case 2:
-+	entries[i].offset = offset;
-+	entries[i].gen = gen;
-+	entries[i].type = xrefEntryCompressed;
-+	break;
-+      default:
-+	return gFalse;
-+      }
-     }
-   }
- 
-@@ -664,38 +694,44 @@
-     // look for object
-     } else if (isdigit(*p)) {
-       num = atoi(p);
--      do {
--	++p;
--      } while (*p && isdigit(*p));
--      if (isspace(*p)) {
-+      if (num > 0) {
- 	do {
- 	  ++p;
--	} while (*p && isspace(*p));
--	if (isdigit(*p)) {
--	  gen = atoi(p);
-+	} while (*p && isdigit(*p));
-+	if (isspace(*p)) {
- 	  do {
- 	    ++p;
--	  } while (*p && isdigit(*p));
--	  if (isspace(*p)) {
-+	  } while (*p && isspace(*p));
-+	  if (isdigit(*p)) {
-+	    gen = atoi(p);
- 	    do {
- 	      ++p;
--	    } while (*p && isspace(*p));
--	    if (!strncmp(p, "obj", 3)) {
--	      if (num >= size) {
--		newSize = (num + 1 + 255) & ~255;
--		entries = (XRefEntry *)
--		            grealloc(entries, newSize * sizeof(XRefEntry));
--		for (i = size; i < newSize; ++i) {
--		  entries[i].offset = 0xffffffff;
--		  entries[i].type = xrefEntryFree;
-+	    } while (*p && isdigit(*p));
-+	    if (isspace(*p)) {
-+	      do {
-+		++p;
-+	      } while (*p && isspace(*p));
-+	      if (!strncmp(p, "obj", 3)) {
-+		if (num >= size) {
-+		  newSize = (num + 1 + 255) & ~255;
-+		  if (newSize < 0) {
-+		    error(-1, "Bad object number");
-+		    return gFalse;
-+		  }
-+		  entries = (XRefEntry *)
-+		      grealloc(entries, newSize * sizeof(XRefEntry));
-+		  for (i = size; i < newSize; ++i) {
-+		    entries[i].offset = 0xffffffff;
-+		    entries[i].type = xrefEntryFree;
-+		  }
-+		  size = newSize;
-+		}
-+		if (entries[num].type == xrefEntryFree ||
-+		    gen >= entries[num].gen) {
-+		  entries[num].offset = pos - start;
-+		  entries[num].gen = gen;
-+		  entries[num].type = xrefEntryUncompressed;
- 		}
--		size = newSize;
--	      }
--	      if (entries[num].type == xrefEntryFree ||
--		  gen >= entries[num].gen) {
--		entries[num].offset = pos - start;
--		entries[num].gen = gen;
--		entries[num].type = xrefEntryUncompressed;
- 	      }
- 	    }
- 	  }

package/public/xpdf/xpdf-3.00pl2.patch.xpdf

@@ -1,73 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/rene/xpdf/xpdf-3.00pl2.patch.xpdf
-# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-*** ./xpdf/Gfx.cc	Sun Dec 12 16:04:43 2004
---- ./xpdf/Gfx.cc	Sun Dec 12 16:05:16 2004
-***************
-*** 2654,2660 ****
-      haveMask = gFalse;
-      dict->lookup("Mask", &maskObj);
-      if (maskObj.isArray()) {
-!       for (i = 0; i < maskObj.arrayGetLength(); ++i) {
-  	maskObj.arrayGet(i, &obj1);
-  	maskColors[i] = obj1.getInt();
-  	obj1.free();
---- 2654,2662 ----
-      haveMask = gFalse;
-      dict->lookup("Mask", &maskObj);
-      if (maskObj.isArray()) {
-!       for (i = 0;
-! 	   i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps;
-! 	   ++i) {
-  	maskObj.arrayGet(i, &obj1);
-  	maskColors[i] = obj1.getInt();
-  	obj1.free();
-*** ./xpdf/GfxState.cc	Sun Dec 12 16:04:48 2004
---- ./xpdf/GfxState.cc	Sun Dec 12 16:06:38 2004
-***************
-*** 708,713 ****
---- 708,718 ----
-    }
-    nCompsA = obj2.getInt();
-    obj2.free();
-+   if (nCompsA > gfxColorMaxComps) {
-+     error(-1, "ICCBased color space with too many (%d > %d) components",
-+ 	  nCompsA, gfxColorMaxComps);
-+     nCompsA = gfxColorMaxComps;
-+   }
-    if (dict->lookup("Alternate", &obj2)->isNull() ||
-        !(altA = GfxColorSpace::parse(&obj2))) {
-      switch (nCompsA) {
-***************
-*** 1054,1060 ****
-    }
-    nCompsA = obj1.arrayGetLength();
-    if (nCompsA > gfxColorMaxComps) {
-!     error(-1, "DeviceN color space with more than %d > %d components",
-  	  nCompsA, gfxColorMaxComps);
-      nCompsA = gfxColorMaxComps;
-    }
---- 1059,1065 ----
-    }
-    nCompsA = obj1.arrayGetLength();
-    if (nCompsA > gfxColorMaxComps) {
-!     error(-1, "DeviceN color space with too many (%d > %d) components",
-  	  nCompsA, gfxColorMaxComps);
-      nCompsA = gfxColorMaxComps;
-    }

package/public/xpdf/xpdf-3.00pl3.patch.xpdf

@@ -1,12 +0,0 @@
---- ./xpdf/XRef.cc.vanilla	2005-08-11 14:49:30.000000000 +0200
-+++ ./xpdf/XRef.cc	2005-08-11 14:50:35.000000000 +0200
-@@ -793,6 +793,9 @@
- 	} else {
- 	  keyLength = 5;
- 	}
-+        if (keyLength > 16) {
-+          keyLength = 16;
-+        }
- 	permFlags = permissions.getInt();
- 	if (encVersion >= 1 && encVersion <= 2 &&
- 	    encRevision >= 2 && encRevision <= 3) {

package/public/xpdf/xpdf.desc

@@ -35,11 +35,11 @@
 
 [L] GPL
 [S] Stable
-[V] 3.00pl3
+[V] 3.01
 [P] X -?---5---9 177.800
 
 [SRC] .
 
-[D] 5395543 t1lib-1.3.tar.gz ftp://ftp.foolabs.com/pub/xpdf/
-[D] 980943908 xpdf-3.00.tar.gz ftp://ftp.foolabs.com/pub/xpdf/
+[D] 3289831444 t1lib-5.1.0.tar.gz ftp://ftp.foolabs.com/pub/xpdf/
+[D] 2394230560 xpdf-3.01.tar.gz ftp://ftp.foolabs.com/pub/xpdf/