GraphicsMagick: Validate Validate legacy Ghostscript font file i...

GraphicsMagick Commits <[email protected]> Thu, 12 Sep 2024 10:24:27 -0500
Newsgroups gmane.comp.video.graphicsmagick.cvs
Message-ID <mailman.20621.1726154688.7812.graphicsmagick-commit@lists.sourceforge.net>
changeset f02aa25402ed in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=f02aa25402ed
summary: Validate Validate legacy Ghostscript font file in Ghostscript install directory before deciding to use it.

diffstat:

 ChangeLog                              |  6 ++++++
 VisualMagick/installer/inc/version.isx |  4 ++--
 configure                              |  7 ++++++-
 configure.ac                           |  7 ++++++-
 magick/version.h                       |  4 ++--
 www/ChangeLog.html                     |  8 ++++++++
 6 files changed, 30 insertions(+), 6 deletions(-)

diffs (100 lines):

diff -r 9bbae7314e3c -r f02aa25402ed ChangeLog
--- a/ChangeLog	Mon Sep 09 08:01:43 2024 -0500
+++ b/ChangeLog	Thu Sep 12 10:24:00 2024 -0500
@@ -1,3 +1,9 @@
+2024-09-12  Bob Friesenhahn  <[email protected]>
+
+	* configure.ac: Validate legacy Ghostscript font file in
+	Ghostscript install directory before deciding to use it as the
+	Ghostscript font directory.
+
 2024-09-09  Bob Friesenhahn  <[email protected]>
 
 	* coders/jxl.c (ReadJXLImage): Apply image dimension resource
diff -r 9bbae7314e3c -r f02aa25402ed VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Mon Sep 09 08:01:43 2024 -0500
+++ b/VisualMagick/installer/inc/version.isx	Thu Sep 12 10:24:00 2024 -0500
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020240909"
-#define public MagickPackageReleaseDate "snapshot-20240909"
+#define public MagickPackageVersionAddendum ".020240912"
+#define public MagickPackageReleaseDate "snapshot-20240912"
diff -r 9bbae7314e3c -r f02aa25402ed configure
--- a/configure	Mon Sep 09 08:01:43 2024 -0500
+++ b/configure	Thu Sep 12 10:24:00 2024 -0500
@@ -33648,12 +33648,17 @@
       fi
     done
 
+    # Look for Ghostscript fonts relative to Ghostscript install directory
     if test "${ghostscript_font_dir}x" = 'x'
     then
       if test "$with_gs" = 'yes' ; then
         if test "$PSDelegate" != "${PSDelegateDefault}"
         then
-          ghostscript_font_dir=`echo "$PSDelegate" | sed -e 's:/bin/gs:/share/ghostscript/fonts:'`"/"
+          font_dir=`echo "$PSDelegate" | sed -e 's:/bin/gs:/share/ghostscript/fonts:'`"/"
+          if test -f "${font_dir}a010013l.pfb"
+          then
+            ghostscript_font_dir="${font_dir}"
+          fi
         fi
       fi
     fi
diff -r 9bbae7314e3c -r f02aa25402ed configure.ac
--- a/configure.ac	Mon Sep 09 08:01:43 2024 -0500
+++ b/configure.ac	Thu Sep 12 10:24:00 2024 -0500
@@ -3697,12 +3697,17 @@
       fi
     done
 
+    # Look for Ghostscript fonts relative to Ghostscript install directory
     if test "${ghostscript_font_dir}x" = 'x'
     then
       if test "$with_gs" = 'yes' ; then
         if test "$PSDelegate" != "${PSDelegateDefault}"
         then
-          ghostscript_font_dir=`echo "$PSDelegate" | sed -e 's:/bin/gs:/share/ghostscript/fonts:'`"/"
+          font_dir=`echo "$PSDelegate" | sed -e 's:/bin/gs:/share/ghostscript/fonts:'`"/"
+          if test -f "${font_dir}a010013l.pfb"
+          then
+            ghostscript_font_dir="${font_dir}"
+          fi
         fi
       fi
     fi
diff -r 9bbae7314e3c -r f02aa25402ed magick/version.h
--- a/magick/version.h	Mon Sep 09 08:01:43 2024 -0500
+++ b/magick/version.h	Thu Sep 12 10:24:00 2024 -0500
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x282502
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 28,25,2
-#define MagickChangeDate   "20240909"
-#define MagickReleaseDate  "snapshot-20240909"
+#define MagickChangeDate   "20240912"
+#define MagickReleaseDate  "snapshot-20240912"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r 9bbae7314e3c -r f02aa25402ed www/ChangeLog.html
--- a/www/ChangeLog.html	Mon Sep 09 08:01:43 2024 -0500
+++ b/www/ChangeLog.html	Thu Sep 12 10:24:00 2024 -0500
@@ -38,6 +38,14 @@
 
 <main id="graphicsmagick-changelog">
 <h1 class="title">GraphicsMagick ChangeLog</h1>
+<p>2024-09-12  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
+<blockquote>
+<ul class="simple">
+<li><p>configure.ac: Validate legacy Ghostscript font file in
+Ghostscript install directory before deciding to use it as the
+Ghostscript font directory.</p></li>
+</ul>
+</blockquote>
 <p>2024-09-09  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
 <blockquote>
 <ul class="simple">