doc/xpdf: version 4.01, SECURITY_PATCH++

7 files changed, 25 insertions, 13 deletions

diff --git a/doc/xpdf/671B682D.gpg b/doc/xpdf/671B682D.gpg
deleted file mode 100644
index 0a3d5da7e2..0000000000
--- a/doc/xpdf/671B682D.gpg
+++ /dev/null
diff --git a/doc/xpdf/BUILD b/doc/xpdf/BUILD
index 8bb765d091..7d8cad8971 100755
--- a/doc/xpdf/BUILD
+++ b/doc/xpdf/BUILD
@@ -1,6 +1,3 @@
-CFLAGS="$CFLAGS -I/usr/include/freetype2"
-CXXFLAGS="$CFLAGS"
-CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2"
-OPTS="$OPTS --without-libpaper-library --enable-multithreaded $A4_PAPER"
+OPTS+=" -DMULTITHREADED=ON ${A4_PAPER}" &&
 
 default_build
diff --git a/doc/xpdf/CONFIGURE b/doc/xpdf/CONFIGURE
index 2bbea44202..f4a8e602b6 100755
--- a/doc/xpdf/CONFIGURE
+++ b/doc/xpdf/CONFIGURE
@@ -1,4 +1,7 @@
+. "${GRIMOIRE}/CMAKE_CONFIGURE" &&
+
+A4_PAPER="${A4_PAPER/--enable-a4-paper/-DA4_PAPER=ON}" &&
+
 config_query_option  A4_PAPER                                              \
 "Use A4 as default paper size instead of Letter for Postscript output?" n  \
-"--enable-a4-paper"                                                        \
-""
+"-DA4_PAPER=ON" "-DA4_PAPER=OFF"
diff --git a/doc/xpdf/DEPENDS b/doc/xpdf/DEPENDS
index f093ce423e..868b15c125 100755
--- a/doc/xpdf/DEPENDS
+++ b/doc/xpdf/DEPENDS
@@ -1,4 +1,6 @@
-depends  freetype2 "--with-freetype2-includes=$TRACK_ROOT/usr/include/freetype2"                 &&
-optional_depends  MOTIF "--with-x" "--without-x" "Build xpdf itself instead of just the utils?"  &&
+source "${GRIMOIRE}/CMAKE_DEPENDS" &&
+depends  freetype2                                                                               &&
+optional_depends  libpaper "" ""                 "for system libpaper"                           &&
+optional_depends  qtbase "" ""                   "Build xpdf itself instead of just the utils?"  &&
 depends  ghostscript-fonts-std                                                                   &&
 optional_depends  "t1lib"  ""  ""  "to display (embedded) Type1 fonts"
diff --git a/doc/xpdf/DETAILS b/doc/xpdf/DETAILS
index 446adce0e8..c1d77a1a67 100755
--- a/doc/xpdf/DETAILS
+++ b/doc/xpdf/DETAILS
@@ -1,13 +1,14 @@
+. "${GRIMOIRE}/CMAKE_FUNCTIONS"
            SPELL=xpdf
-         VERSION=3.04
-  SECURITY_PATCH=7
+         VERSION=4.01
+  SECURITY_PATCH=8
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=ftp://ftp.foolabs.com/pub/xpdf/$SOURCE
+   SOURCE_URL[0]="https://xpdfreader-dl.s3.amazonaws.com/${SOURCE}"
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
-        WEB_SITE=http://www.foolabs.com/xpdf
-      SOURCE_GPG=671B682D.gpg:$SOURCE2:UPSTREAM_KEY
+        WEB_SITE="https://www.xpdfreader.com/"
+      SOURCE_GPG="xpdf.gpg:$SOURCE2:UPSTREAM_KEY"
   SOURCE2_IGNORE=signature
         KEYWORDS="pdf doc"
          ENTERED=20010923
diff --git a/doc/xpdf/HISTORY b/doc/xpdf/HISTORY
index becc37e003..bf37d27773 100644
--- a/doc/xpdf/HISTORY
+++ b/doc/xpdf/HISTORY
@@ -1,3 +1,12 @@
+2019-02-19 Pavel Vinogradov <public@sourcemage.org>
+	* DETAILS: version 4.01, converted to cmake build system, updated
+	  source url and website, SECURITY_PATCH++, (CVE-2018-7174,
+	  CVE-2018-7175, CVE-2018-16368, CVE-2018-18651)
+	* BUILD, CONFIGURE, DEPENDS: cmakeified, MOTIF -> qtbase, added
+	  libpaper optional dependency
+	* 671B682D.gpg: removed
+	* xpdf.gpg: added new key, F4825F5397271342, -Xpdf- <xpdf@xpdfreader.com>
+
 2015-11-29 Ismael Luceno <ismael@sourcemage.org>
 	* PRE_BUILD: removed, no longer needed
 	* char.patch: removed, no longer needed
diff --git a/doc/xpdf/xpdf.gpg b/doc/xpdf/xpdf.gpg
new file mode 100644
index 0000000000..299b6b5bf8
--- /dev/null
+++ b/doc/xpdf/xpdf.gpg