MFH: r513783 r513785 r513786

Pacify stage-qa in DEVELOPER mode.

Update WWW.

PR:		241066
Submitted by:	naddy

Backport fix for CVE-2019-16927 and CVE-2019-9877 from xpdf4.

PR:		241066
Submitted by:	naddy

Approved by:	portmgr (miwi)

graphics/xpdf3/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	xpdf
 PORTVERSION=	3.04
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics print
 MASTER_SITES=	http://mirrors.rit.edu/zi/ \
 		ftp://ftp.foolabs.com/pub/xpdf/ \
@@ -24,7 +24,9 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png
 
 GNU_CONFIGURE=	yes
-USES=		gmake cpe localbase
+USES=		gmake cpe localbase xorg
+USE_XORG=	ice sm x11 xext xt
+
 CPE_VENDOR=	foolabs
 CONFIGURE_ARGS=	--enable-opi \
 		--with-freetype2-library="${LOCALBASE}/lib" \

graphics/xpdf3/files/patch-xpdf_TextOutputDev.cc

@@ -0,0 +1,15 @@
+--- xpdf/TextOutputDev.cc.orig	2019-10-04 19:39:06 UTC
++++ xpdf/TextOutputDev.cc
+@@ -2472,6 +2472,12 @@ TextBlock *TextPage::split(GList *charsA, int rot) {
+ 
+   //----- compute the horizontal and vertical profiles
+ 
++  if (xMin / splitPrecision < 0.5 * INT_MIN ||
++      xMax / splitPrecision > 0.5 * INT_MAX ||
++      yMin / splitPrecision < 0.5 * INT_MIN ||
++      xMax / splitPrecision > 0.5 * INT_MAX) {
++    return NULL;
++  }
+   // add some slack to the array bounds to avoid floating point
+   // precision problems
+   xMinI = (int)floor(xMin / splitPrecision) - 1;

graphics/xpdf3/pkg-descr

@@ -5,4 +5,4 @@ PDF software.
 It can also convert PDF input to ps, text, and info formats; and
 split out fonts and images.
 
-WWW: http://www.foolabs.com/xpdf/
+WWW: https://www.xpdfreader.com/