Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 19 Oct 2019 03:08:41 +0000 (UTC)
From:      Cy Schubert <cy@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r514746 - in branches/2019Q4/graphics/xpdf3: . files
Message-ID:  <201910190308.x9J38f7S011755@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cy
Date: Sat Oct 19 03:08:41 2019
New Revision: 514746
URL: https://svnweb.freebsd.org/changeset/ports/514746

Log:
  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)

Added:
  branches/2019Q4/graphics/xpdf3/files/patch-xpdf_TextOutputDev.cc
     - copied unchanged from r513786, head/graphics/xpdf3/files/patch-xpdf_TextOutputDev.cc
Modified:
  branches/2019Q4/graphics/xpdf3/Makefile
  branches/2019Q4/graphics/xpdf3/pkg-descr
Directory Properties:
  branches/2019Q4/   (props changed)

Modified: branches/2019Q4/graphics/xpdf3/Makefile
==============================================================================
--- branches/2019Q4/graphics/xpdf3/Makefile	Fri Oct 18 23:23:38 2019	(r514745)
+++ branches/2019Q4/graphics/xpdf3/Makefile	Sat Oct 19 03:08:41 2019	(r514746)
@@ -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" \

Copied: branches/2019Q4/graphics/xpdf3/files/patch-xpdf_TextOutputDev.cc (from r513786, head/graphics/xpdf3/files/patch-xpdf_TextOutputDev.cc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2019Q4/graphics/xpdf3/files/patch-xpdf_TextOutputDev.cc	Sat Oct 19 03:08:41 2019	(r514746, copy of r513786, head/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;

Modified: branches/2019Q4/graphics/xpdf3/pkg-descr
==============================================================================
--- branches/2019Q4/graphics/xpdf3/pkg-descr	Fri Oct 18 23:23:38 2019	(r514745)
+++ branches/2019Q4/graphics/xpdf3/pkg-descr	Sat Oct 19 03:08:41 2019	(r514746)
@@ -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/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910190308.x9J38f7S011755>