CVS commit: pkgsrc/print/xpdf4

["Olaf Seibert" <rhialto%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Tue Apr  2 18:27:55 UTC 2024

Modified Files:
        pkgsrc/print/xpdf4: Makefile distinfo
        pkgsrc/print/xpdf4/patches: patch-xpdf_GlobalParams.cc

Log Message:
Lots of changes (given in source in CHANGES at the end) including several PDF
object loops (CVE-2018-7453, CVE-2018-16369, CVE-2022-36561, CVE-2022-41844,
CVE-2023-2663, CVE-2023-2664), a deadlock and an integer overflow.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/print/xpdf4/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/xpdf4/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/print/xpdf4/patches/patch-xpdf_GlobalParams.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/xpdf4/Makefile
diff -u pkgsrc/print/xpdf4/Makefile:1.32 pkgsrc/print/xpdf4/Makefile:1.33
--- pkgsrc/print/xpdf4/Makefile:1.32    Mon Feb 19 09:27:11 2024
+++ pkgsrc/print/xpdf4/Makefile Tue Apr  2 18:27:55 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2024/02/19 09:27:11 markd Exp $
+# $NetBSD: Makefile,v 1.33 2024/04/02 18:27:55 rhialto Exp $
 
-DISTNAME=      xpdf-4.04
-PKGREVISION=   12
+DISTNAME=      xpdf-4.05
 CATEGORIES=    print
 MASTER_SITES=  https://dl.xpdfreader.com/
 

Index: pkgsrc/print/xpdf4/distinfo
diff -u pkgsrc/print/xpdf4/distinfo:1.6 pkgsrc/print/xpdf4/distinfo:1.7
--- pkgsrc/print/xpdf4/distinfo:1.6     Sat Sep  3 17:06:00 2022
+++ pkgsrc/print/xpdf4/distinfo Tue Apr  2 18:27:55 2024
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2022/09/03 17:06:00 wiz Exp $
+$NetBSD: distinfo,v 1.7 2024/04/02 18:27:55 rhialto Exp $
 
-BLAKE2s (xpdf-4.04.tar.gz) = 7062a3f635a8332401fe421cd654e4ce376cfac7b06b0c232bcdf381e20a85a1
-SHA512 (xpdf-4.04.tar.gz) = a26b67a4b3d5a5a365153845bf72d77949e683ce26aaf4705b49194cb32bbc581617c3e9c37f74bf6c49480df06d49e8c38d41233966b6215eacf92591d4d9bf
-Size (xpdf-4.04.tar.gz) = 969535 bytes
+BLAKE2s (xpdf-4.05.tar.gz) = b917ffe19af9d0edbd17f1e6e24d67f7885f957bac26195069393e4f27b1118d
+SHA512 (xpdf-4.05.tar.gz) = 1ee18a2fcae138e60158cf6289f588832a982e1b13995382a396d1953949cf4e32cb4f9884f2506154512d961853e70ff499a35c525e707c3bf2950fe7f9040b
+Size (xpdf-4.05.tar.gz) = 986596 bytes
 SHA1 (patch-cmake-config.txt) = a2c25a258c8c72494c3b53854cabf2e51db0c32d
 SHA1 (patch-doc_sample-xpdfrc) = c16f4355efa279e79b9f27bc256e7569a348f13d
 SHA1 (patch-xpdf-qt_XpdfWidgetPrint.cc) = 8d05b6e95228f07cc571b176ec821f5b535424e8
-SHA1 (patch-xpdf_GlobalParams.cc) = c997a3c3da33c30d259f26fe37b407ab6f1f491f
+SHA1 (patch-xpdf_GlobalParams.cc) = a0322fda0b8977afc8b7ea2d7855395e59fd837d

Index: pkgsrc/print/xpdf4/patches/patch-xpdf_GlobalParams.cc
diff -u pkgsrc/print/xpdf4/patches/patch-xpdf_GlobalParams.cc:1.1 pkgsrc/print/xpdf4/patches/patch-xpdf_GlobalParams.cc:1.2
--- pkgsrc/print/xpdf4/patches/patch-xpdf_GlobalParams.cc:1.1   Sat Dec 19 13:42:59 2020
+++ pkgsrc/print/xpdf4/patches/patch-xpdf_GlobalParams.cc       Tue Apr  2 18:27:55 2024
@@ -1,13 +1,13 @@
-$NetBSD: patch-xpdf_GlobalParams.cc,v 1.1 2020/12/19 13:42:59 rhialto Exp $
+$NetBSD: patch-xpdf_GlobalParams.cc,v 1.2 2024/04/02 18:27:55 rhialto Exp $
 
 Adjust font search directories to @PREFIX@.
 
---- xpdf/GlobalParams.cc.orig  2019-09-25 19:54:33.000000000 +0000
+--- xpdf/GlobalParams.cc.orig  2024-02-07 20:32:41.000000000 +0000
 +++ xpdf/GlobalParams.cc
-@@ -109,11 +109,16 @@ static const char *displayFontDirs[] = {
- };
- #else
- static const char *displayFontDirs[] = {
+@@ -107,11 +107,16 @@ static const char *displayFontDirs[] = {
+   "c:/windows/fonts",
+   "c:/winnt/fonts",
+ #else // _WIN32
 -  "/usr/share/ghostscript/fonts",
 +  "@PREFIX@/share/ghostscript/fonts",
    "/usr/local/share/ghostscript/fonts",