GraphicsMagick: fuzzing/oss-fuzz-build.sh: Assure that the EXTRA...

changeset 7aaa5875ab09 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=7aaa5875ab09
summary: fuzzing/oss-fuzz-build.sh: Assure that the EXTRA_LIBS shell variable is initialized.

diffstat:

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

diffs (108 lines):

diff -r 6f89ea4b8c0b -r 7aaa5875ab09 ChangeLog
--- a/ChangeLog	Sun May 19 10:52:43 2024 -0500
+++ b/ChangeLog	Wed May 22 08:36:10 2024 -0500
@@ -1,3 +1,8 @@
+2024-05-22  Bob Friesenhahn  <[email protected]>
+
+	* fuzzing/oss-fuzz-build.sh (EXTRA_LIBS): Assure that the
+	EXTRA_LIBS shell variable is initialized.
+
 2024-05-19  Bob Friesenhahn  <[email protected]>
 
 	* fuzzing/oss-fuzz-build.sh: Fix 'undefined' sanitizer linkage
diff -r 6f89ea4b8c0b -r 7aaa5875ab09 VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Sun May 19 10:52:43 2024 -0500
+++ b/VisualMagick/installer/inc/version.isx	Wed May 22 08:36:10 2024 -0500
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020240519"
-#define public MagickPackageReleaseDate "snapshot-20240519"
+#define public MagickPackageVersionAddendum ".020240522"
+#define public MagickPackageReleaseDate "snapshot-20240522"
diff -r 6f89ea4b8c0b -r 7aaa5875ab09 fuzzing/oss-fuzz-build.sh
--- a/fuzzing/oss-fuzz-build.sh	Sun May 19 10:52:43 2024 -0500
+++ b/fuzzing/oss-fuzz-build.sh	Wed May 22 08:36:10 2024 -0500
@@ -21,6 +21,8 @@
 # FUZZER_LDFLAGS
 # FUZZING_LANGUAGE
 # WORK=/work
+# OUT=/out
+# SRC=/src
 
 enable_aom=true
 enable_bzip2=true
@@ -35,7 +37,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
@@ -564,13 +566,14 @@
 # freetype-config is in $WORK/bin so we temporarily add $WORK/bin to the path
 # pkg-config names GraphicsMagick, GraphicsMagickWand, GraphicsMagick++
 # -stdlib=libc++'
-printf "=== Building GraphicsMagick...\n"
-case "$SANITIZER" in
+printf "=== Building GraphicsMagick (SANITIZER=${SANITIZER})...\n"
+EXTRA_LIBS=''
+case "${SANITIZER}" in
     address)
-        EXTRA_LIBS=-lc++
+        EXTRA_LIBS='-lc++'
     ;;
     memory)
-        EXTRA_LIBS=-lc++
+        EXTRA_LIBS='-lc++'
     ;;
     undefined)
         EXTRA_LIBS='-lubsan -lc++'
@@ -579,10 +582,10 @@
 ./bootstrap
 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" \
+    CFLAGS="${CFLAGS}" \
     LDFLAGS="${LDFLAGS:-} -L$WORK/lib" \
-    LIBS="$EXTRA_LIBS" \
-    --prefix="$WORK" \
+    LIBS="${EXTRA_LIBS}" \
+    --prefix="${WORK}" \
     --disable-compressed-files \
     --without-perl \
     --with-quantum-depth=16
diff -r 6f89ea4b8c0b -r 7aaa5875ab09 magick/version.h
--- a/magick/version.h	Sun May 19 10:52:43 2024 -0500
+++ b/magick/version.h	Wed May 22 08:36:10 2024 -0500
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x282500
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 28,25,0
-#define MagickChangeDate   "20240519"
-#define MagickReleaseDate  "snapshot-20240519"
+#define MagickChangeDate   "20240522"
+#define MagickReleaseDate  "snapshot-20240522"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r 6f89ea4b8c0b -r 7aaa5875ab09 www/ChangeLog.html
--- a/www/ChangeLog.html	Sun May 19 10:52:43 2024 -0500
+++ b/www/ChangeLog.html	Wed May 22 08:36:10 2024 -0500
@@ -38,6 +38,13 @@
 
 <div class="document" id="graphicsmagick-changelog">
 <h1 class="title">GraphicsMagick ChangeLog</h1>
+<p>2024-05-22  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 (EXTRA_LIBS): Assure that the
+EXTRA_LIBS shell variable is initialized.</p></li>
+</ul>
+</blockquote>
 <p>2024-05-19  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">