3 files changed, 6 insertions, 74 deletions
diff --git a/source/xap/xpdf/patches/xpdf-3.03-CVE-2012-2142.diff b/source/xap/xpdf/patches/xpdf-3.03-CVE-2012-2142.diff
deleted file mode 100644
index 891c41fd3..000000000
--- a/source/xap/xpdf/patches/xpdf-3.03-CVE-2012-2142.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-From 3945969e0072217c143fefa3044512a31ac2afa8 Mon Sep 17 00:00:00 2001
-From: mancha <mancha1@hush.com>
-Date: Sun, 11 Aug 2013
-Subject: CVE-2012-2142
-
-Filter stuff that might end up in the shell to address CVE-2012-2142.
-This code was adapted from the Poppler project.
----
- Error.cc |   21 ++++++++++++++++-----
- 1 file changed, 16 insertions(+), 5 deletions(-)
-
---- a/xpdf/Error.cc	2013-08-11
-+++ b/xpdf/Error.cc	2013-08-11
-@@ -43,7 +43,7 @@ void setErrorCallback(void (*cbk)(void *
- 
- void CDECL error(ErrorCategory category, int pos, const char *msg, ...) {
-   va_list args;
--  GString *s;
-+  GString *s, *sanitized;
- 
-   // NB: this can be called before the globalParams object is created
-   if (!errorCbk && globalParams && globalParams->getErrQuiet()) {
-@@ -52,17 +52,28 @@ void CDECL error(ErrorCategory category,
-   va_start(args, msg);
-   s = GString::formatv(msg, args);
-   va_end(args);
-+
-+  sanitized = new GString ();
-+  for (int i = 0; i < s->getLength(); ++i) {
-+    const char c = s->getChar(i);
-+    if (c < (char)0x20 || c >= (char)0x7f) {
-+      sanitized->appendf("<{0:02x}>", c & 0xff);
-+    } else {
-+      sanitized->append(c);
-+    }
-+  }
-+
-   if (errorCbk) {
--    (*errorCbk)(errorCbkData, category, pos, s->getCString());
-+    (*errorCbk)(errorCbkData, category, pos, sanitized->getCString());
-   } else {
-     if (pos >= 0) {
-       fprintf(stderr, "%s (%d): %s\n",
--	      errorCategoryNames[category], pos, s->getCString());
-+	      errorCategoryNames[category], pos, sanitized->getCString());
-     } else {
-       fprintf(stderr, "%s: %s\n",
--	      errorCategoryNames[category], s->getCString());
-+	      errorCategoryNames[category], sanitized->getCString());
-     }
-     fflush(stderr);
-   }
--  delete s;
-+  delete sanitized;
- }
diff --git a/source/xap/xpdf/patches/xpdf.XPDFViewer.diff b/source/xap/xpdf/patches/xpdf.XPDFViewer.diff
deleted file mode 100644
index 0aa4455d5..000000000
--- a/source/xap/xpdf/patches/xpdf.XPDFViewer.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./xpdf/XPDFViewer.cc.orig	2011-08-15 16:08:53.000000000 -0500
-+++ ./xpdf/XPDFViewer.cc	2013-03-28 15:35:31.589432279 -0500
-@@ -1803,7 +1803,7 @@
-   menuPane = XmCreatePulldownMenu(toolBar, "zoomMenuPane", args, n);
-   for (i = 0; i < nZoomMenuItems; ++i) {
-     n = 0;
--    s = XmStringCreateLocalized(zoomMenuInfo[i].label);
-+    s = XmStringCreateLocalized((char *)zoomMenuInfo[i].label);
-     XtSetArg(args[n], XmNlabelString, s); ++n;
-     XtSetArg(args[n], XmNuserData, (XtPointer)i); ++n;
-     sprintf(buf, "zoom%d", i);
diff --git a/source/xap/xpdf/xpdf.SlackBuild b/source/xap/xpdf/xpdf.SlackBuild
index 6aa5e1b45..aa3af9604 100755
--- a/source/xap/xpdf/xpdf.SlackBuild
+++ b/source/xap/xpdf/xpdf.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,24 +21,24 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=3.03
+VERSION=3.04
 PATCHLEVEL=
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
@@ -71,8 +71,6 @@ find . \
   -exec chmod 644 {} \;
 
 zcat $CWD/patches/xpdfrc.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/xpdf.XPDFViewer.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/xpdf-3.03-CVE-2012-2142.diff.gz | patch -p1 --verbose || exit 1
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \