GraphicsMagick: fuzzing/oss-fuzz-build.sh: Skip re-bootstrap of ...

changeset 2f12a51bd4d4 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=2f12a51bd4d4
summary: fuzzing/oss-fuzz-build.sh: Skip re-bootstrap of GraphicsMagick since it sometimes fails due to network issues.

diffstat:

 ChangeLog                              |   5 +++++
 VisualMagick/installer/inc/version.isx |   4 ++--
 fuzzing/oss-fuzz-build.sh              |  15 ++++++++++++---
 magick/version.h                       |   4 ++--
 www/ChangeLog.html                     |   7 +++++++
 5 files changed, 28 insertions(+), 7 deletions(-)

diffs (93 lines):

diff -r a706e21de4b0 -r 2f12a51bd4d4 ChangeLog
--- a/ChangeLog	Tue Oct 29 09:54:05 2024 -0500
+++ b/ChangeLog	Wed Oct 30 10:12:41 2024 -0500
@@ -1,3 +1,8 @@
+2024-10-30  Bob Friesenhahn  <[email protected]>
+
+	* fuzzing/oss-fuzz-build.sh: Skip re-bootstrap of GraphicsMagick
+	since it sometimes fails due to network issues.
+
 2024-10-29  Bob Friesenhahn  <[email protected]>
 
 	* coders/heif.c (ReadMetadata): Address oss-fuzz issue 376100386
diff -r a706e21de4b0 -r 2f12a51bd4d4 VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Tue Oct 29 09:54:05 2024 -0500
+++ b/VisualMagick/installer/inc/version.isx	Wed Oct 30 10:12:41 2024 -0500
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020241029"
-#define public MagickPackageReleaseDate "snapshot-20241029"
+#define public MagickPackageVersionAddendum ".020241030"
+#define public MagickPackageReleaseDate "snapshot-20241030"
diff -r a706e21de4b0 -r 2f12a51bd4d4 fuzzing/oss-fuzz-build.sh
--- a/fuzzing/oss-fuzz-build.sh	Tue Oct 29 09:54:05 2024 -0500
+++ b/fuzzing/oss-fuzz-build.sh	Wed Oct 30 10:12:41 2024 -0500
@@ -46,7 +46,7 @@
 
 enable_aom=true
 enable_bzip2=true
-enable_de265=true
+enable_de265=false
 enable_freetype=true
 enable_heif=true
 enable_jasper=true
@@ -57,7 +57,7 @@
 enable_png=true
 enable_tiff=true
 enable_webp=true
-enable_x265=false
+enable_x265=true
 enable_xml=false
 enable_xz=true
 enable_zstd=true
@@ -658,7 +658,16 @@
         EXTRA_LIBS='-lubsan -lc++'
     ;;
 esac
-./bootstrap
+
+# Re-bootstrap the GraphicsMagick Autotools and scripts. The
+# GraphicsMagick repository is already bootstrapped so
+# re-bootstrapping is not really necessary.  Sometimes this fails due
+# to issues with network access while updating config.guess and
+# config.sub.
+#
+#./bootstrap || printf "Failed to re-bootstrap GraphicsMagick!\n"
+
+# Configure GraphicsMagick
 PATH=$WORK/bin:$PATH PKG_CONFIG_PATH="$WORK/lib/pkgconfig" PKG_CONFIG='pkg-config --static' ./configure \
     CPPFLAGS="-I$WORK/include/libpng16 -I$WORK/include/freetype2 -I$WORK/include/libxml2 -I$WORK/include" \
     CFLAGS="${CFLAGS}" \
diff -r a706e21de4b0 -r 2f12a51bd4d4 magick/version.h
--- a/magick/version.h	Tue Oct 29 09:54:05 2024 -0500
+++ b/magick/version.h	Wed Oct 30 10:12:41 2024 -0500
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x282502
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 28,25,2
-#define MagickChangeDate   "20241029"
-#define MagickReleaseDate  "snapshot-20241029"
+#define MagickChangeDate   "20241030"
+#define MagickReleaseDate  "snapshot-20241030"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r a706e21de4b0 -r 2f12a51bd4d4 www/ChangeLog.html
--- a/www/ChangeLog.html	Tue Oct 29 09:54:05 2024 -0500
+++ b/www/ChangeLog.html	Wed Oct 30 10:12:41 2024 -0500
@@ -38,6 +38,13 @@
 
 <main id="graphicsmagick-changelog">
 <h1 class="title">GraphicsMagick ChangeLog</h1>
+<p>2024-10-30  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>fuzzing/oss-fuzz-build.sh: Skip re-bootstrap of GraphicsMagick
+since it sometimes fails due to network issues.</p></li>
+</ul>
+</blockquote>
 <p>2024-10-29  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">