xpdf: Updated to 3.02 and SECURITY_PATCH=2

6 files changed, 17 insertions, 93 deletions

diff --git a/doc/xpdf/BUILD b/doc/xpdf/BUILD
index b5b4a7a2e2..e59d6b5b08 100755
--- a/doc/xpdf/BUILD
+++ b/doc/xpdf/BUILD
@@ -3,5 +3,4 @@ CXXFLAGS="$CFLAGS"
 CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2"
 OPTS="$OPTS --enable-multithreaded $A4_PAPER"
 
-patch -p1 < $SOURCE_CACHE/$SOURCE2  &&
 default_build
diff --git a/doc/xpdf/DETAILS b/doc/xpdf/DETAILS
index 3efb31bcf0..54ad161047 100755
--- a/doc/xpdf/DETAILS
+++ b/doc/xpdf/DETAILS
@@ -1,18 +1,16 @@
            SPELL=xpdf
-         VERSION=3.01pl2
-  SECURITY_PATCH=1
-          SOURCE=$SPELL-3.01.tar.gz
-         SOURCE2=$SPELL-$VERSION.patch
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-3.01
+         VERSION=3.02
+  SECURITY_PATCH=2
+          SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=ftp://ftp.foolabs.com/pub/xpdf/$SOURCE
-  SOURCE2_URL[1]=ftp://ftp.foolabs.com/pub/xpdf/$SOURCE2
         WEB_SITE=http://www.foolabs.com/xpdf
-     SOURCE_HASH=sha512:add411b8c27caeb32360c82c7b6e81245633c404681890d3bf662d5fe425bdbef6be0c61eded074db2823cf9c399722cbedf8d765dcde94049d7fae77b45c81e
-    SOURCE2_HASH=sha512:a6752adc588168562ddcfe5c1de9ef0ce4a196622ccf8825f2e69f5ecc5df2c6a401a9fd21f7119b9062fdcd489cd9cc9e26dde633152c9356f966ab9b8316ef
-         ENTERED=20010923
+#     SOURCE_HASH=sha512:add411b8c27caeb32360c82c7b6e81245633c404681890d3bf662d5fe425bdbef6be0c61eded074db2823cf9c399722cbedf8d765dcde94049d7fae77b45c81e
+      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
       PATCHLEVEL=2
-         LICENSE=GPL
         KEYWORDS="pdf doc"
+         ENTERED=20010923
+         LICENSE=GPL
            SHORT="xpdf: a PDF viewer for X11R6."
 cat << EOF
 Xpdf is a viewer for Portable Document Format (PDF) files. It also
diff --git a/doc/xpdf/HISTORY b/doc/xpdf/HISTORY
index acf8479d67..a98623739f 100644
--- a/doc/xpdf/HISTORY
+++ b/doc/xpdf/HISTORY
@@ -1,3 +1,12 @@
+2007-03-30 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Updated to 3.02
+	  Removed SOURCE2 (unneeded patch)
+	  SECURITY_PATCH=2: Fixed security holes (bounds checking issues) in
+	  several places.
+	* PRE_BUILD: Removed, no more patches to apply
+	* BUILD: No longer apply patch that was SOURCE2
+	* xpdf-3.01-noftinternals.patch: Removed, no longer needed
+
 2006-11-12 George Sherwood <george@beernabeer.com>
 	* DETAILS: Updated PATCH_LEVEL
 	* PRE_BUILD: Added patch
diff --git a/doc/xpdf/PRE_BUILD b/doc/xpdf/PRE_BUILD
deleted file mode 100755
index 31b01a9eb5..0000000000
--- a/doc/xpdf/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build  &&
-unpack_file 2  &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/xpdf-3.01-noftinternals.patch
diff --git a/doc/xpdf/xpdf-3.01-noftinternals.patch b/doc/xpdf/xpdf-3.01-noftinternals.patch
deleted file mode 100644
index 29a65b2856..0000000000
--- a/doc/xpdf/xpdf-3.01-noftinternals.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -urN splash/SplashFTFont.cc splash/SplashFTFont.cc
---- splash/SplashFTFont.cc	2005-12-23 16:57:18.076514614 +0100
-+++ splash/SplashFTFont.cc	2005-12-23 17:33:42.731318339 +0100
-@@ -14,7 +14,8 @@
- 
- #include <ft2build.h>
- #include FT_OUTLINE_H
--#include FT_INTERNAL_OBJECTS_H // needed for FT_New_Size decl
-+#include FT_SIZES_H // needed for FT_New_Size decl
-+#include FT_GLYPH_H
- #include "gmem.h"
- #include "SplashMath.h"
- #include "SplashGlyphBitmap.h"
-@@ -25,11 +26,12 @@
- 
- //------------------------------------------------------------------------
- 
--static int glyphPathMoveTo(FT_Vector *pt, void *path);
--static int glyphPathLineTo(FT_Vector *pt, void *path);
--static int glyphPathConicTo(FT_Vector *ctrl, FT_Vector *pt, void *path);
--static int glyphPathCubicTo(FT_Vector *ctrl1, FT_Vector *ctrl2,
--			    FT_Vector *pt, void *path);
-+static int glyphPathMoveTo( const FT_Vector *pt, void *path);
-+static int glyphPathLineTo( const FT_Vector *pt, void *path);
-+static int glyphPathConicTo( const FT_Vector *ctrl, const FT_Vector *pt,
-+                             void* path );
-+static int glyphPathCubicTo( const FT_Vector *ctrl1, const FT_Vector *ctrl2,
-+			     const FT_Vector *pt, void *path);
- 
- //------------------------------------------------------------------------
- // SplashFTFont
-@@ -210,7 +212,7 @@
- };
- 
- SplashPath *SplashFTFont::getGlyphPath(int c) {
--  static FT_Outline_Funcs outlineFuncs = {
-+  static const FT_Outline_Funcs outlineFuncs = {
-     &glyphPathMoveTo,
-     &glyphPathLineTo,
-     &glyphPathConicTo,
-@@ -249,7 +251,7 @@
-   return path.path;
- }
- 
--static int glyphPathMoveTo(FT_Vector *pt, void *path) {
-+static int glyphPathMoveTo( const FT_Vector *pt, void *path) {
-   SplashFTFontPath *p = (SplashFTFontPath *)path;
-
-   if (p->needClose) {
-@@ -260,7 +262,7 @@
-   return 0;
- }
- 
--static int glyphPathLineTo(FT_Vector *pt, void *path) {
-+static int glyphPathLineTo(const FT_Vector *pt, void *path) {
-   SplashFTFontPath *p = (SplashFTFontPath *)path;
- 
-   p->path->lineTo(pt->x / 64.0, -pt->y / 64.0);
-@@ -268,7 +270,7 @@
-   return 0;
- }
- 
--static int glyphPathConicTo(FT_Vector *ctrl, FT_Vector *pt, void *path) {
-+static int glyphPathConicTo(const FT_Vector *ctrl, const FT_Vector *pt, void *path) {
-   SplashFTFontPath *p = (SplashFTFontPath *)path;
-   SplashCoord x0, y0, x1, y1, x2, y2, x3, y3, xc, yc;
- 
-@@ -306,8 +308,8 @@
-   return 0;
- }
- 
--static int glyphPathCubicTo(FT_Vector *ctrl1, FT_Vector *ctrl2,
--			    FT_Vector *pt, void *path) {
-+static int glyphPathCubicTo(const FT_Vector *ctrl1, const FT_Vector *ctrl2,
-+			    const FT_Vector *pt, void *path) {
-   SplashFTFontPath *p = (SplashFTFontPath *)path;
- 
-   p->path->curveTo(ctrl1->x / 64.0, -ctrl1->y / 64.0,
diff --git a/doc/xpdf/xpdf-3.02.tar.gz.sig b/doc/xpdf/xpdf-3.02.tar.gz.sig
new file mode 100644
index 0000000000..3b80f36ffd
--- /dev/null
+++ b/doc/xpdf/xpdf-3.02.tar.gz.sig