From 0666fd03f6b807d399e08601769b2f4cbe2de03c Mon Sep 17 00:00:00 2001
From: Mathieu Westphal <mathieu.westphal@kitware.com>
Date: Thu, 19 Jan 2023 09:37:24 +0100
Subject: [PATCH 01/28] Avoid optionnaly depends on zip for NCZarr

---
 CMakeLists.txt | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b0573111..cb40488a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1214,16 +1214,12 @@ ELSE() # No option specified
     SET(PLUGIN_INSTALL_DIR_SETTING "N.A.")
 ENDIF()
 
-# See if we have libzip
-FIND_PACKAGE(Zip)
-
-# Define a test flag for have zip library
-IF(Zip_FOUND)
+# Try to enable NCZarr zip support
+OPTION(ENABLE_NCZARR_ZIP "Enable NCZarr ZIP support." ON)
+IF (ENABLE_NCZARR_ZIP)
+  FIND_PACKAGE(Zip REQUIRED)
   INCLUDE_DIRECTORIES(${Zip_INCLUDE_DIRS})
-  SET(ENABLE_NCZARR_ZIP TRUE)
-ELSE()
-  SET(ENABLE_NCZARR_ZIP FALSE)
-ENDIF()
+ENDIF ()
 
 # libdl is always available; built-in in Windows and OSX
 OPTION(ENABLE_PLUGINS "Enable dynamically loaded plugins (default on)." ON)

From 4608f0815943abac386104e5e7b345d8a97a51ee Mon Sep 17 00:00:00 2001
From: Greg Sjaardema <gsjaardema@gmail.com>
Date: Mon, 6 Feb 2023 07:50:00 -0700
Subject: [PATCH 02/28] Missing `goto`

There is either a missing `goto fail` on this line, or the empty if statement line should be removed.
---
 libdispatch/dhttp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libdispatch/dhttp.c b/libdispatch/dhttp.c
index 071252e47..3b8eba6e2 100644
--- a/libdispatch/dhttp.c
+++ b/libdispatch/dhttp.c
@@ -258,7 +258,7 @@ nc_http_write(NC_HTTP_STATE* state, const char* objecturl, NCbytes* payload)
     Trace("write");
 
     if((stat = nc_http_set_payload(state,ncbyteslength(payload),ncbytescontents(payload)))) goto fail;
-    if((stat = nc_http_set_method(state,HTTPPUT)));
+    if((stat = nc_http_set_method(state,HTTPPUT))) goto fail;
     if((stat = setupconn(state,objecturl))) goto fail;
     if((stat = execute(state)))
 	goto done;

From 727fa749005fa7868735fff82474b4476c6f5c6f Mon Sep 17 00:00:00 2001
From: Dennis Heimbigner <dmh@ucar.edu>
Date: Fri, 10 Feb 2023 15:10:43 -0700
Subject: [PATCH 03/28] Modify H5FDhttp.c to work with HDF5 1.14.0

re: https://github.com/Unidata/netcdf-c/issues/2614

Most of the changes are minor comment changes.
But the dispatch table for H5FD has changed, requiring changes
to H5FDhttp.c, which is derived from the HDF5 source file H5FDstdio.c.
The patch is to conditionally modify the dispatch table
to conform to the HDF5-1.14.0 version.
I was able to build and successfully test 1.14 for a reasonable
set of (non-parallel) ./configure options.
---
 libhdf5/H5FDhttp.c | 83 +++++++++++++++++++++++++++-------------------
 libhdf5/H5FDhttp.h |  6 +++-
 2 files changed, 53 insertions(+), 36 deletions(-)

diff --git a/libhdf5/H5FDhttp.c b/libhdf5/H5FDhttp.c
index 81dba1f5b..4b9c42e97 100644
--- a/libhdf5/H5FDhttp.c
+++ b/libhdf5/H5FDhttp.c
@@ -5,7 +5,6 @@
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
@@ -105,7 +104,7 @@ typedef struct H5FD_http_t {
     haddr_t     eof;            /* end of file; current file size   */
     haddr_t     pos;            /* current file I/O position        */
     unsigned    write_access;   /* Flag to indicate the file was opened with write access */
-    H5FD_http_file_op op;		/* last operation */
+    H5FD_http_file_op op;	/* last operation */
     NC_HTTP_STATE*  state;       /* Curl handle + extra */
     char*           url;        /* The URL (minus any fragment) for the dataset */ 
 } H5FD_http_t;
@@ -163,40 +162,54 @@ static herr_t H5FD_http_unlock(H5FD_t *_file);
 
 /* Beware, not same as H5FD_HTTP_g */
 static const H5FD_class_t H5FD_http_g = {
-    "http",                     /* name         */
-    MAXADDR,                    /* maxaddr      */
-    H5F_CLOSE_WEAK,             /* fc_degree    */
-#ifndef H5FDCLASS1
-    H5FD_http_term,             /* terminate    */
+#if H5_VERSION_GE(1,14,0)
+    H5FD_CLASS_VERSION,		/* struct version  */
+    H5_VFD_HTTP,		/* value           */
 #endif
-    NULL,                       /* sb_size      */
-    NULL,                       /* sb_encode    */
-    NULL,                       /* sb_decode    */
-    0,                          /* fapl_size    */
-    NULL,                       /* fapl_get     */
-    NULL,                       /* fapl_copy    */
-    NULL,                       /* fapl_free    */
-    0,                          /* dxpl_size    */
-    NULL,                       /* dxpl_copy    */
-    NULL,                       /* dxpl_free    */
-    H5FD_http_open,            /* open         */
-    H5FD_http_close,           /* close        */
-    H5FD_http_cmp,             /* cmp          */
-    H5FD_http_query,           /* query        */
-    NULL,                       /* get_type_map */
-    H5FD_http_alloc,           /* alloc        */
-    NULL,                       /* free         */
-    H5FD_http_get_eoa,         /* get_eoa      */
-    H5FD_http_set_eoa,         /* set_eoa      */
-    H5FD_http_get_eof,         /* get_eof      */
-    H5FD_http_get_handle,      /* get_handle   */
-    H5FD_http_read,            /* read         */
-    H5FD_http_write,           /* write        */
-    H5FD_http_flush,           /* flush        */
-    NULL, 		       /* truncate     */
-    H5FD_http_lock,            /* lock         */
-    H5FD_http_unlock,          /* unlock       */
-    H5FD_FLMAP_DICHOTOMY       /* fl_map       */
+    "http",			/* name         */
+    MAXADDR,			/* maxaddr      */
+    H5F_CLOSE_WEAK,		/* fc_degree    */
+#ifndef H5FDCLASS1
+    H5FD_http_term,		/* terminate    */
+#endif
+    NULL,			/* sb_size      */
+    NULL,			/* sb_encode    */
+    NULL,			/* sb_decode    */
+    0,				/* fapl_size    */
+    NULL,			/* fapl_get     */
+    NULL,			/* fapl_copy    */
+    NULL,			/* fapl_free    */
+    0,				/* dxpl_size    */
+    NULL,			/* dxpl_copy    */
+    NULL,			/* dxpl_free    */
+    H5FD_http_open,		/* open         */
+    H5FD_http_close,		/* close        */
+    H5FD_http_cmp,		/* cmp          */
+    H5FD_http_query,		/* query        */
+    NULL,			/* get_type_map */
+    H5FD_http_alloc,		/* alloc        */
+    NULL,			/* free         */
+    H5FD_http_get_eoa,		/* get_eoa      */
+    H5FD_http_set_eoa,		/* set_eoa      */
+    H5FD_http_get_eof,		/* get_eof      */
+    H5FD_http_get_handle,	/* get_handle   */
+    H5FD_http_read,		/* read         */
+    H5FD_http_write,		/* write        */
+#if H5_VERSION_GE(1,14,0)
+    NULL,			/* read_vector     */
+    NULL,			/* write_vector    */
+    NULL,			/* read_selection  */
+    NULL,			/* write_selection */
+#endif
+    H5FD_http_flush,		/* flush        */
+    NULL,			/* truncate     */
+    H5FD_http_lock,		/* lock         */
+    H5FD_http_unlock,		/* unlock       */
+#if H5_VERSION_GE(1,14,0)
+    NULL,			/* del          */
+    NULL,			/* ctl	        */
+#endif
+    H5FD_FLMAP_DICHOTOMY	/* fl_map       */
 };
 
 
diff --git a/libhdf5/H5FDhttp.h b/libhdf5/H5FDhttp.h
index 210f44a72..6d4553998 100644
--- a/libhdf5/H5FDhttp.h
+++ b/libhdf5/H5FDhttp.h
@@ -5,7 +5,6 @@
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
@@ -30,7 +29,12 @@
 
 #include "H5Ipublic.h"
 
+#if H5_VERSION_GE(1,14,0)
+#define H5_VFD_HTTP     ((H5FD_class_value_t)(H5_VFD_MAX - 2))
+#define H5FD_HTTP	(H5FDperform_init(H5FD_http_init))
+#else
 #define H5FD_HTTP	(H5FD_http_init())
+#endif
 
 #ifdef __cplusplus
 extern "C" {

From 6b6c73a4ad9336bd6f33255197bb306bfc16e381 Mon Sep 17 00:00:00 2001
From: Dennis Heimbigner <dmh@ucar.edu>
Date: Fri, 10 Feb 2023 15:48:50 -0700
Subject: [PATCH 04/28] update release notes

---
 RELEASE_NOTES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index b486b8ea6..31b07f59f 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -7,6 +7,8 @@ This file contains a high-level description of this package's evolution. Release
 
 ## 4.9.2 - TBD
 
+* [Bug Fix] Update H5FDhttp.[ch] to work with HDF5 version 1.14.0. See [Github #2615](https://github.com/Unidata/netcdf-c/pull/2615).
+
 ## 4.9.1 - February 2, 2023
 
 ## Known Issues

From f40f524303d10b158e48cb4eba040ec96deec42c Mon Sep 17 00:00:00 2001
From: Sergey Kosukhin <sergey.kosukhin@mpimet.mpg.de>
Date: Mon, 13 Feb 2023 16:57:06 +0100
Subject: [PATCH 05/28] Fix macro usage

---
 libhdf5/hdf5internal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libhdf5/hdf5internal.c b/libhdf5/hdf5internal.c
index 83add362d..fa13ebbef 100644
--- a/libhdf5/hdf5internal.c
+++ b/libhdf5/hdf5internal.c
@@ -163,7 +163,7 @@ find_var_dim_max_length(NC_GRP_INFO_T *grp, int varid, int dimid,
                 if (var->dimids[d] == dimid)
                     *maxlen = *maxlen > h5dimlen[d] ? *maxlen : h5dimlen[d];
 
-#ifdef USE_PARALLEL
+#ifdef USE_PARALLEL4
 	    /* If we are doing parallel I/O in collective mode (with
 	     * either pnetcdf or HDF5), then communicate with all
 	     * other tasks in the collective and find out which has

From 6f55c85260b7f4b4a8c10cd359d2b9f9b2222f60 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Mon, 13 Feb 2023 10:52:41 -0700
Subject: [PATCH 06/28] Update nc-config in support of
 https://github.com/Unidata/netcdf-c/issues/2274

---
 RELEASE_NOTES.md   |   2 +
 nc-config.cmake.in |  84 +-------------------------
 nc-config.in       | 143 +--------------------------------------------
 3 files changed, 6 insertions(+), 223 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index b486b8ea6..23156c6f9 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -7,6 +7,8 @@ This file contains a high-level description of this package's evolution. Release
 
 ## 4.9.2 - TBD
 
+* Update `nc-config` to remove inclusion from automatically-detected `nf-config` and `ncxx-config` files, as the wrong files could be included in the output.  This is in support of [GitHub #2274](https://github.com/Unidata/netcdf-c/issues/2274).
+
 ## 4.9.1 - February 2, 2023
 
 ## Known Issues
diff --git a/nc-config.cmake.in b/nc-config.cmake.in
index 657a9e7bc..e9dda9999 100644
--- a/nc-config.cmake.in
+++ b/nc-config.cmake.in
@@ -139,40 +139,6 @@ fi
 
 version="@PACKAGE@ @VERSION@"
 
-
-has_fortran="no"
-has_f90="no"
-has_f03="no"
-
-nfconf=$(which nf-config 2>/dev/null)
-
-if [ -f "$nfconf" ]; then
-  has_fortran="yes"
-  fc=`nf-config --fc`
-  fflags=`nf-config --fflags`
-  flibs=`nf-config --flibs`
-  has_f90=`nf-config --has-f90`
-  has_f03=`nf-config --has-f03`
-fi
-
-has_cxx="no"
-has_cxx4="no"
-
-ncxxconf=$(which ncxx-config 2>/dev/null)
-ncxx4conf=$(which ncxx4-config 2>/dev/null)
-
-if [ -f "$ncxx4conf" ]; then
-  cxx4=`ncxx4-config --cxx`
-  cxx4flags=`ncxx4-config --cflags`
-  cxx4libs=`ncxx4-config --libs`
-  has_cxx4="yes"
-elif [ -f "$ncxxconf" ]; then
-  cxx=`ncxx-config --cxx`
-  cxxflags=`ncxx-config --cflags`
-  cxxlibs=`ncxx-config --libs`
-  has_cxx="yes"
-fi
-
 usage()
 {
     cat <<EOF
@@ -184,9 +150,7 @@ Available values for OPTION include:
   --all              display all options
   --cc               C compiler
   --cflags           pre-processor and compiler flags
-  --has-c++          whether C++ API is installed
-  --has-c++4         whether netCDF-4 C++ API is installed
-  --has-fortran      whether Fortran API is installed
+  
   --has-dap2         whether OPeNDAP (DAP2) is enabled in this build
   --has-dap4         whether DAP4 is enabled in this build
   --has-dap          same as --has-dap2 (Deprecated)
@@ -216,28 +180,7 @@ Available values for OPTION include:
   --version       Library version
 
 EOF
-if [ -f "$ncxx4conf" ]; then
-    cat <<EOF
-  --cxx4          C++ compiler for netCDF-4 C++ library
-  --cxx4flags     flags needed to compile a C++ program
-  --cxx4libs      libraries needed to link a C++ program
-EOF
-elif [ -f "$ncxxconf" ]; then
-    cat <<EOF
-  --cxx           C++ compiler
-  --cxxflags      flags needed to compile a C++ program
-  --cxxlibs       libraries needed to link a C++ program
-EOF
-fi
-if [ -f "$nfconf" ]; then
-    cat <<EOF
-  --fc            Fortran compiler
-  --fflags        flags needed to compile a Fortran program
-  --flibs         libraries needed to link a Fortran program
-  --has-f90       whether Fortran 90 API is installed
-  --has-f03       whether Fortran 03 API is installed (implies F90).
-EOF
-fi
+
     exit $1
 }
 
@@ -251,30 +194,7 @@ all()
         echo "  --libs          -> $libs"
         echo "  --static        -> $libsprivate"
         echo
-        echo "  --has-c++       -> $has_cxx"
-        echo "  --cxx           -> $cxx"
 
-if [ -f "$ncxxconf" ]; then
-        echo "  --cxxflags      -> $cxxflags"
-        echo "  --cxxlibs       -> $cxxlibs"
-fi
-        echo
-        echo "  --has-c++4      -> $has_cxx4"
-        echo "  --cxx4          -> $cxx4"
-if [ -f "$ncxx4conf" ]; then
-        echo "  --cxx4flags     -> $cxx4flags"
-        echo "  --cxx4libs      -> $cxx4libs"
-fi
-        echo
-        echo "  --has-fortran   -> $has_fortran"
-if [ -f "$nfconf" ]; then
-        echo "  --fc            -> $fc"
-        echo "  --fflags        -> $fflags"
-        echo "  --flibs         -> $flibs"
-        echo "  --has-f90       -> $has_f90"
-        echo "  --has-f03       -> $has_f03"
-        echo
-fi
         echo 
         echo "  --has-dap          -> $has_dap2"
         echo "  --has-dap2         -> $has_dap2"
diff --git a/nc-config.in b/nc-config.in
index 459df374b..66913a1ac 100644
--- a/nc-config.in
+++ b/nc-config.in
@@ -41,40 +41,6 @@ has_stdfilters="@STD_FILTERS@"
 version="@PACKAGE_NAME@ @PACKAGE_VERSION@"
 HAS_STATIC=""
 
-
-has_fortran="no"
-has_f90="no"
-has_f03="no"
-
-nfconf=$(which nf-config 2>/dev/null)
-
-if [ -f "$nfconf" ]; then
-  has_fortran="yes"
-  fc=`nf-config --fc`
-  fflags=`nf-config --fflags`
-  flibs=`nf-config --flibs`
-  has_f90=`nf-config --has-f90`
-  has_f03=`nf-config --has-f03`
-fi
-
-has_cxx="no"
-has_cxx4="no"
-
-ncxxconf=$(which ncxx-config 2>/dev/null)
-ncxx4conf=$(which ncxx4-config 2>/dev/null)
-
-if [ -f "$ncxx4conf" ]; then
-  cxx4=`ncxx4-config --cxx`
-  cxx4flags=`ncxx4-config --cflags`
-  cxx4libs=`ncxx4-config --libs`
-  has_cxx4="yes"
-elif [ -f "$ncxxconf" ]; then
-  cxx=`ncxx-config --cxx`
-  cxxflags=`ncxx-config --cflags`
-  cxxlibs=`ncxx-config --libs`
-  has_cxx="yes"
-fi
-
 usage()
 {
     cat <<EOF
@@ -86,9 +52,7 @@ Available values for OPTION include:
   --all              display all options
   --cc               C compiler
   --cflags           pre-processor and compiler flags
-  --has-c++          whether C++ API is installed
-  --has-c++4         whether netCDF-4 C++ API is installed
-  --has-fortran      whether Fortran API is installed
+  
   --has-dap2         whether OPeNDAP (DAP2) is enabled in this build
   --has-dap4         whether DAP4 is enabled in this build
   --has-dap          same as --has-dap2 (Deprecated)
@@ -118,28 +82,7 @@ Available values for OPTION include:
   --version       Library version
 
 EOF
-if [ -f "$ncxx4conf" ]; then
-    cat <<EOF
-  --cxx4          C++ compiler for netCDF-4 C++ library
-  --cxx4flags     flags needed to compile a C++ program
-  --cxx4libs      libraries needed to link a C++ program
-EOF
-elif [ -f "$ncxxconf" ]; then
-    cat <<EOF
-  --cxx           C++ compiler
-  --cxxflags      flags needed to compile a C++ program
-  --cxxlibs       libraries needed to link a C++ program
-EOF
-fi
-if [ -f "$nfconf" ]; then
-    cat <<EOF
-  --fc            Fortran compiler
-  --fflags        flags needed to compile a Fortran program
-  --flibs         libraries needed to link a Fortran program
-  --has-f90       whether Fortran 90 API is installed
-  --has-f03       whether Fortran 03 API is installed (implies F90).
-EOF
-fi
+
     exit $1
 }
 
@@ -152,32 +95,6 @@ all()
         echo "  --cflags        -> $cflags"
         echo "  --libs          -> $libs"
         echo "  --static        -> $libsprivate"
-        echo
-        echo "  --has-c++       -> $has_cxx"
-        echo "  --cxx           -> $cxx"
-
-if [ -f "$ncxxconf" ]; then
-        echo "  --cxxflags      -> $cxxflags"
-        echo "  --cxxlibs       -> $cxxlibs"
-fi
-        echo
-        echo "  --has-c++4      -> $has_cxx4"
-        echo "  --cxx4          -> $cxx4"
-if [ -f "$ncxx4conf" ]; then
-        echo "  --cxx4flags     -> $cxx4flags"
-        echo "  --cxx4libs      -> $cxx4libs"
-fi
-        echo
-
-        echo "  --has-fortran   -> $has_fortran"
-if [ -f "$nfconf" ]; then
-        echo "  --fc            -> $fc"
-        echo "  --fflags        -> $fflags"
-        echo "  --flibs         -> $flibs"
-        echo "  --has-f90       -> $has_f90"
-        echo "  --has-f03       -> $has_f03"
-        echo
-fi
         echo "  --has-dap          -> $has_dap"
         echo "  --has-dap2         -> $has_dap"
         echo "  --has-dap4         -> $has_dap4"
@@ -355,62 +272,6 @@ while test $# -gt 0; do
         echo $version
         ;;
 
-    --has-c++)
-        echo $has_cxx
-        ;;
-
-    --cxx)
-        echo $cxx
-        ;;
-
-    --cxxflags)
-        echo $cxxflags
-        ;;
-
-    --cxxlibs)
-        echo $cxxlibs
-        ;;
-
-    --has-c++4)
-        echo $has_cxx4
-        ;;
-
-    --cxx4)
-        echo $cxx4
-        ;;
-
-    --cxx4flags)
-        echo $cxx4flags
-        ;;
-
-    --cxx4libs)
-        echo $cxx4libs
-        ;;
-
-    --has-fortran)
-        echo $has_fortran
-        ;;
-
-    --fc)
-        echo $fc
-        ;;
-
-    --fflags)
-        echo $fflags
-        ;;
-
-    --flibs)
-        echo $flibs
-        ;;
-
-    --has-f90)
-        echo $has_f90
-        ;;
-
-    --has-f03)
-        echo $has_f03
-        ;;
-
     *)
         echo "unknown option: $1"
         usage 1

From c85c804279318d20d8edec93a0dc0bab74193bb7 Mon Sep 17 00:00:00 2001
From: Magnus Ulimoen <magnusu@met.no>
Date: Wed, 15 Feb 2023 11:43:14 +0100
Subject: [PATCH 07/28] Fix setting dest for non-m4 path

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b0573111..46f948c10 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2005,7 +2005,7 @@ MACRO(GEN_m4 filename)
     IF(NOT EXISTS ${fallbackdest})
       MESSAGE(FATAL_ERROR "m4 is required to generate ${filename}.c. Please install m4 so that it is on the PATH and try again.")
     ELSE()
-      SET(${dest} ${fallbackdest})
+      SET(dest ${fallbackdest})
     ENDIF()
   ELSE()
     ADD_CUSTOM_COMMAND(

From c05505a1b87b19c436b6f6b2270c86d0b0840a7f Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Thu, 16 Feb 2023 11:20:45 -0700
Subject: [PATCH 08/28] Added benchmarking option to cmake-based builds, turned
 on unit-testing by default

---
 CMakeLists.txt | 12 +++++++++++-
 configure.ac   |  6 +++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b0573111..b655d479c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1411,7 +1411,14 @@ IF(ENABLE_TESTS)
   # Option to turn on unit testing. See
   # https://github.com/Unidata/netcdf-c/pull/1472 for more information.
   ###
-  OPTION(ENABLE_UNIT_TESTS "Run Unit Tests." OFF)
+  OPTION(ENABLE_UNIT_TESTS "Run Unit Tests." ON)
+
+  ###
+  # Option to turn on performance testing.
+  # See https://github.com/Unidata/netcdf-c/issues/2627 for more information.
+  ###
+  OPTION(ENABLE_BENCHMARKS "Run benchmark Tests." ON)
+  
 
   ###
   # End known-failures.
@@ -2364,6 +2371,9 @@ IF(ENABLE_TESTS)
   IF(ENABLE_EXAMPLES)
     ADD_SUBDIRECTORY(examples)
   ENDIF()
+  IF(ENABLE_BENCHMARKS)
+    ADD_SUBDIRECTORY(nc_perf)
+  ENDIF(ENABLE_BENCHMARKS)
   IF(ENABLE_UNIT_TESTS)
     ADD_SUBDIRECTORY(unit_test)
   ENDIF(ENABLE_UNIT_TESTS)
diff --git a/configure.ac b/configure.ac
index 6c0698d80..be6835a59 100644
--- a/configure.ac
+++ b/configure.ac
@@ -325,13 +325,13 @@ fi
 
 # Does the user want to turn off unit tests (useful for test coverage
 # analysis).
-AC_MSG_CHECKING([if unit tests should be disabled])
+AC_MSG_CHECKING([if unit tests should be enabled])
 AC_ARG_ENABLE([unit-tests],
-  [AS_HELP_STRING([--disable-unit-tests],
+  [AS_HELP_STRING([--enable-unit-tests],
     [Disable tests in unit_test directory. Other tests still run.])])
 test "x$enable_unit_tests" = xno || enable_unit_tests=yes
 AC_MSG_RESULT($enable_unit_tests)
-AM_CONDITIONAL([BUILD_UNIT_TESTS], [test "x$enable_unit_tests" = xyes])
+AM_CONDITIONAL(BUILD_UNIT_TESTS, [test "x$enable_unit_tests" = xyes])
 
 # Does the user require dynamic loading?
 # This is only for those hdf5 installs that support it.

From 2efb3404885a7441785365c61b307a963dc537a4 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Thu, 16 Feb 2023 15:06:27 -0700
Subject: [PATCH 09/28] Wiring performance benchmarks into cmake, cleaned up
 serial compression performance test dependency on MPI.

---
 nc_perf/CMakeLists.txt | 15 ++++++++++-----
 nc_perf/tst_compress.c |  1 -
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/nc_perf/CMakeLists.txt b/nc_perf/CMakeLists.txt
index d0acdb61e..8c30175af 100644
--- a/nc_perf/CMakeLists.txt
+++ b/nc_perf/CMakeLists.txt
@@ -24,8 +24,10 @@ add_bin_test(nc_perf tst_files3 tst_utils.c)
 add_bin_test(nc_perf tst_mem tst_utils.c)
 add_bin_test(nc_perf tst_wrf_reads tst_utils.c)
 add_bin_test(nc_perf tst_attsperf tst_utils.c)
+add_bin_test(nc_perf tst_bm_rando tst_utils.c)
+add_bin_test(nc_perf tst_compress tst_utils.c)
 
-add_sh_test(nc_perf run_knmi_bm)
+#add_sh_test(nc_perf run_knmi_bm)
 add_sh_test(nc_perf perftest)
 add_sh_test(nc_perf run_tst_chunks)
 add_sh_test(nc_perf run_bm_elena)
@@ -36,9 +38,12 @@ add_sh_test(nc_perf run_bm_test2)
 
 # This will run a parallel I/O benchmark for parallel builds.
 IF(TEST_PARALLEL4)
+add_bin_test(nc_perf tst_compress_par tst_utils.c)
 add_sh_test(nc_perf run_par_bm_test)
-ENDIF()
-ENDIF()
+add_sh_test(nc_test )
+ENDIF(TEST_PARALLEL4)
+ENDIF(BUILD_UTILITIES)
+
+FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
+FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE)
 
-ADD_EXTRA_DIST(run_par_bm_test.sh.in run_knmi_bm.sh CMakeLists.txt
-perftest.sh run_bm_test1.sh run_bm_test2.sh)
diff --git a/nc_perf/tst_compress.c b/nc_perf/tst_compress.c
index 354ac422c..1495ff484 100644
--- a/nc_perf/tst_compress.c
+++ b/nc_perf/tst_compress.c
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <math.h>
 #include <netcdf.h>
-#include <netcdf_par.h>
 #include <netcdf_meta.h>
 
 #define TEST_NAME "tst_compress"

From cd655eb4426b6778b70a82b09ac60c5b8ac7347f Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Thu, 16 Feb 2023 15:09:14 -0700
Subject: [PATCH 10/28] Correct typo in CMakeLists.txt

---
 nc_perf/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nc_perf/CMakeLists.txt b/nc_perf/CMakeLists.txt
index 8c30175af..6f6ef0ec2 100644
--- a/nc_perf/CMakeLists.txt
+++ b/nc_perf/CMakeLists.txt
@@ -40,7 +40,6 @@ add_sh_test(nc_perf run_bm_test2)
 IF(TEST_PARALLEL4)
 add_bin_test(nc_perf tst_compress_par tst_utils.c)
 add_sh_test(nc_perf run_par_bm_test)
-add_sh_test(nc_test )
 ENDIF(TEST_PARALLEL4)
 ENDIF(BUILD_UTILITIES)
 

From d6a5f987c152a32a550563218d83c1e44483969a Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Thu, 16 Feb 2023 15:52:43 -0700
Subject: [PATCH 11/28] Add generated parallel tests for nc_perf, cmake-based
 build system.

---
 CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b655d479c..33dd44605 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2614,6 +2614,11 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nc_test4/findplugin.in ${CMAKE_CURREN
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nc_test4/findplugin.in ${CMAKE_CURRENT_BINARY_DIR}/plugins/findplugin.sh @ONLY NEWLINE_STYLE LF)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/nc_test4/findplugin.in ${CMAKE_CURRENT_BINARY_DIR}/examples/C/findplugin.sh @ONLY NEWLINE_STYLE LF)
 
+IF(ENABLE_BENCHMARKS)
+  IF(ENABLE_PARALLEL4)
+    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/nc_perf/run_par_bm_test.sh.in ${CMAKE_CURRENT_BINARY_DIR}/nc_perf/run_par_bm_test.sh @ONLY NEWLINE_STYLE LF)
+    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/nc_perf/run_gfs_test.sh.in ${CMAKE_CURRENT_BINARY_DIR}/nc_perf/run_gfs_test.sh @ONLY NEWLINE_STYLE LF)
+  ENDIF(ENABLE_PARALLEL4)
 IF(ENABLE_TESTS)
     #####
     # Build ncdap_test|dap4_test/findtestserver[4].c

From 1931a487d2070105a620307a881cba03669c77b0 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Thu, 16 Feb 2023 15:56:25 -0700
Subject: [PATCH 12/28] Fix missing endif statement

---
 CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33dd44605..08d560f44 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2619,6 +2619,8 @@ IF(ENABLE_BENCHMARKS)
     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/nc_perf/run_par_bm_test.sh.in ${CMAKE_CURRENT_BINARY_DIR}/nc_perf/run_par_bm_test.sh @ONLY NEWLINE_STYLE LF)
     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/nc_perf/run_gfs_test.sh.in ${CMAKE_CURRENT_BINARY_DIR}/nc_perf/run_gfs_test.sh @ONLY NEWLINE_STYLE LF)
   ENDIF(ENABLE_PARALLEL4)
+ENDIF(ENABLE_BENCHMARKS)
+
 IF(ENABLE_TESTS)
     #####
     # Build ncdap_test|dap4_test/findtestserver[4].c

From efa0c8df45b1f861d2c346e35bb51d3b1d522ba4 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Thu, 16 Feb 2023 15:58:42 -0700
Subject: [PATCH 13/28] Add execute bit to test scripts

---
 nc_perf/run_gfs_test.sh.in    | 0
 nc_perf/run_par_bm_test.sh.in | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 nc_perf/run_gfs_test.sh.in
 mode change 100644 => 100755 nc_perf/run_par_bm_test.sh.in

diff --git a/nc_perf/run_gfs_test.sh.in b/nc_perf/run_gfs_test.sh.in
old mode 100644
new mode 100755
diff --git a/nc_perf/run_par_bm_test.sh.in b/nc_perf/run_par_bm_test.sh.in
old mode 100644
new mode 100755

From 49c71a53b40e371e0d4f566b28d1251c53489917 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Thu, 16 Feb 2023 16:41:19 -0700
Subject: [PATCH 14/28] Turn benchmarks off by default. They require netcdf4,
 additional logic is required in order to have them on by default.

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08d560f44..f1ed32278 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1417,8 +1417,8 @@ IF(ENABLE_TESTS)
   # Option to turn on performance testing.
   # See https://github.com/Unidata/netcdf-c/issues/2627 for more information.
   ###
-  OPTION(ENABLE_BENCHMARKS "Run benchmark Tests." ON)
-  
+  OPTION(ENABLE_BENCHMARKS "Run benchmark Tests." OFF)
+
 
   ###
   # End known-failures.

From 295c1327895f55424649422181429759d37c22b8 Mon Sep 17 00:00:00 2001
From: Dennis Heimbigner <dmh@ucar.edu>
Date: Fri, 17 Feb 2023 13:01:11 -0700
Subject: [PATCH 15/28] Fix a distcheck failure with nczarr_test/run_interop.sh

The problem was that files were being copied
into the ${srcdir} rather than ${builddir} directory.
---
 RELEASE_NOTES.md           |  6 ++--
 libhdf5/H5FDhttp.h         |  2 +-
 nczarr_test/Makefile.am    |  3 +-
 nczarr_test/run_interop.sh | 72 +++++++++++++++++++++-----------------
 nczarr_test/s3util.c       |  5 ++-
 5 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index e5864b2f2..6bac6e56a 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,4 +1,4 @@
-Release Notes       {#RELEASE_NOTES}
+1Release Notes       {#RELEASE_NOTES}
 =============
 
 \brief Release notes file for the netcdf-c package.
@@ -7,9 +7,9 @@ This file contains a high-level description of this package's evolution. Release
 
 ## 4.9.2 - TBD
 
-
+* Fix 'make distcheck' error in run_interop.sh. See [Github #????](https://github.com/Unidata/netcdf-c/pull/????).
 * Update `nc-config` to remove inclusion from automatically-detected `nf-config` and `ncxx-config` files, as the wrong files could be included in the output.  This is in support of [GitHub #2274](https://github.com/Unidata/netcdf-c/issues/2274).
-* [Bug Fix] Update H5FDhttp.[ch] to work with HDF5 version 1.14.0. See [Github #2615](https://github.com/Unidata/netcdf-c/pull/2615).
+* Update H5FDhttp.[ch] to work with HDF5 version 1.14.0. See [Github #2615](https://github.com/Unidata/netcdf-c/pull/2615).
 
 ## 4.9.1 - February 2, 2023
 
diff --git a/libhdf5/H5FDhttp.h b/libhdf5/H5FDhttp.h
index 6d4553998..2e0e11db8 100644
--- a/libhdf5/H5FDhttp.h
+++ b/libhdf5/H5FDhttp.h
@@ -30,7 +30,7 @@
 #include "H5Ipublic.h"
 
 #if H5_VERSION_GE(1,14,0)
-#define H5_VFD_HTTP     ((H5FD_class_value_t)(H5_VFD_MAX - 2))
+#define H5_VFD_HTTP     ((H5FD_class_value_t)(514))
 #define H5FD_HTTP	(H5FDperform_init(H5FD_http_init))
 #else
 #define H5FD_HTTP	(H5FD_http_init())
diff --git a/nczarr_test/Makefile.am b/nczarr_test/Makefile.am
index 3e04bb7c7..5e1237699 100644
--- a/nczarr_test/Makefile.am
+++ b/nczarr_test/Makefile.am
@@ -164,7 +164,8 @@ ref_string.cdl ref_string_nczarr.baseline ref_string_zarr.baseline ref_scalar.cd
 ref_nulls_nczarr.baseline ref_nulls_zarr.baseline ref_nulls.cdl
 
 # Interoperability files
-EXTRA_DIST += ref_power_901_constants_orig.zip ref_power_901_constants.cdl ref_quotes_orig.zip ref_quotes.cdl 
+EXTRA_DIST += ref_power_901_constants_orig.zip ref_power_901_constants.cdl ref_quotes_orig.zip ref_quotes.cdl \
+ref_zarr_test_data.cdl.gz
 
 CLEANFILES = ut_*.txt ut*.cdl tmp*.nc tmp*.cdl tmp*.txt tmp*.dmp tmp*.zip tmp*.nc tmp*.dump tmp*.tmp tmp_ngc.c ref_zarr_test_data.cdl tst_*.nc.zip ref_quotes.zip ref_power_901_constants.zip
 
diff --git a/nczarr_test/run_interop.sh b/nczarr_test/run_interop.sh
index f3b9ea232..f3d7812d8 100755
--- a/nczarr_test/run_interop.sh
+++ b/nczarr_test/run_interop.sh
@@ -17,35 +17,35 @@ UB="${NCZARR_S3_TEST_BUCKET}"
 
 testcasefile() {
   zext=file
-  ref=$1
+  base=$1
   mode=$2
   metaonly=$3
   if test "x$metaonly" = xmetaonly ; then flags="-h"; fi
-  fileargs ${execdir}/$ref "mode=$mode,$zext"
-  rm -f tmp_${ref}_${zext}.cdl
-  ${NCDUMP} $flags $fileurl > tmp_${ref}_${zext}.cdl
-  diff -b ${srcdir}/${ref}.cdl tmp_${ref}_${zext}.cdl
+  fileargs ${builddir}/ref_$base "mode=$mode,$zext"
+  rm -f tmp_${base}_${zext}.cdl
+  ${NCDUMP} $flags $fileurl > tmp_${base}_${zext}.cdl
+  diff -b ${srcdir}/ref_${base}.cdl tmp_${base}_${zext}.cdl
 }
 
 testcasezip() {
   zext=zip
-  ref=$1
+  base=$1
   mode=$2
-  fileargs $ref "mode=$mode,$zext"
-  rm -f tmp_${ref}_${zext}.cdl
-  ${NCDUMP} -h $flags $fileurl > tmp_${ref}_${zext}.cdl
-  diff -b ${srcdir}/${ref}.cdl tmp_${ref}_${zext}.cdl
+  fileargs ${builddir}/ref_$base "mode=$mode,$zext"
+  rm -f tmp_${base}_${zext}.cdl
+  ${NCDUMP} -h $flags $fileurl > tmp_${base}_${zext}.cdl
+  diff -b ${srcdir}/ref_${base}.cdl tmp_${base}_${zext}.cdl
 }
 
 testcases3() {
   zext=s3
-  zarr=$1
-  ref=$2
-  mode=$3
-  rm -f tmp_${zarr}_${zext}.cdl
-  url="https://${UH}/${UB}/${zarr}#mode=${mode},s3"
-  ${NCDUMP} $url > tmp_${zarr}_${zext}.cdl
-  diff -b ${srcdir}/${ref}.cdl tmp_${zarr}_${zext}.cdl
+  base=$1
+  mode=$2
+  rm -f tmp_${base}_${zext}.cdl
+  url="https://${UH}/${UB}/${base}.zarr#mode=${mode},s3"
+  ${NCDUMP} $url > tmp_${base}_${zext}.cdl
+  # Find the proper ref file
+  diff -b ${builddir}/ref_${base}.cdl tmp_${base}_${zext}.cdl
 }
 
 testallcases() {
@@ -54,27 +54,35 @@ case "$zext" in
     file)
 	# need to unpack
 	rm -fr ref_power_901_constants ref_power_901_constants.file
-	unzip ${srcdir}/ref_power_901_constants_orig.zip > /dev/null
-	mv ref_power_901_constants ref_power_901_constants.file
-	testcasefile ref_power_901_constants zarr metaonly; # test xarray as default
+        if ! test -f ${builddir}/ref_power_901_constants_orig.zip ; then
+          cp -f ${srcdir}/ref_power_901_constants_orig.zip ${builddir}/ref_power_901_constants_orig.zip
+	fi
+	unzip ${builddir}/ref_power_901_constants_orig.zip > /dev/null
+	mv ${builddir}/ref_power_901_constants ${builddir}/ref_power_901_constants.file
+	testcasefile power_901_constants zarr metaonly; # test xarray as default
 	;;
     zip)
 	# Move into position
-        cp ${srcdir}/ref_power_901_constants_orig.zip ${execdir}/ref_power_901_constants.zip
-        cp ${srcdir}/ref_quotes_orig.zip ${execdir}/ref_quotes.zip
-	testcasezip ref_power_901_constants xarray metaonly
+        if ! test -f ${builddir}/ref_power_901_constants.zip ; then
+          cp -f ${srcdir}/ref_power_901_constants_orig.zip ${builddir}/ref_power_901_constants.zip
+        fi
+        if ! test -f ${builddir}/ref_quotes.zip ; then
+          cp -f ${srcdir}/ref_quotes_orig.zip ${builddir}/ref_quotes.zip
+	fi
+	testcasezip power_901_constants xarray metaonly
 	# Test large constant interoperability 
-	testcasezip ref_quotes zarr metaonly
+	testcasezip quotes zarr metaonly
 	;;
     s3)
 	# Read a test case created by netcdf-java zarr.
 	# Move into position
-        rm -f ${execdir}/ref_zarr_test_data.cdl
-	# Use gunzip because it always appears to be available
-	if ! test -f ${srcdir}/ref_zarr_test_data.cdl ; then
-            gunzip -c ${srcdir}/ref_zarr_test_data.cdl.gz > ${srcdir}/ref_zarr_test_data.cdl
+        rm -f ${builddir}/ref_zarr_test_data.cdl
+        if ! test -f ${builddir}/ref_zarr_test_data.cdl.gz ; then
+	  cp -f ${srcdir}/ref_zarr_test_data.cdl.gz ${builddir}/ref_zarr_test_data.cdl.gz 
 	fi
-        testcases3 zarr_test_data.zarr ref_zarr_test_data xarray
+	# Use gunzip because it always appears to be available
+        gunzip -c ${builddir}/ref_zarr_test_data.cdl.gz > ${builddir}/ref_zarr_test_data.cdl
+        testcases3 zarr_test_data xarray
  	;;
     *) echo "unimplemented kind: $1" ; exit 1;;
 esac
@@ -83,9 +91,9 @@ esac
 testallcases file
 if test "x$FEATURE_NCZARR_ZIP" = xyes ; then testallcases zip; fi
 if test "x$FEATURE_S3TESTS" = xyes ; then testallcases s3; fi
-exit
+
 # Cleanup
-rm -fr ${execdir}/ref_power_901_constants.file
-rm -f ${execdir}/ref_zarr_test_data.cdl
+rm -fr ${builddir}/ref_power_901_constants_orig.zip
+rm -fr ${builddir}/ref_zarr_test_data.cdl.gz
 
 exit 0
diff --git a/nczarr_test/s3util.c b/nczarr_test/s3util.c
index 07e03ef1c..0852a45a0 100644
--- a/nczarr_test/s3util.c
+++ b/nczarr_test/s3util.c
@@ -128,7 +128,7 @@ main(int argc, char** argv)
 
     dumpoptions.nctype = NC_UBYTE; /* default */
 
-    while ((c = getopt(argc, argv, "df:k:p:t:T:u:v")) != EOF) {
+    while ((c = getopt(argc, argv, "df:hk:p:t:T:u:v")) != EOF) {
 	switch(c) {
 	case 'd': 
 	    dumpoptions.debug = 1;	    
@@ -136,6 +136,9 @@ main(int argc, char** argv)
 	case 'f':
 	    dumpoptions.filename = strdup(optarg);
 	    break;
+	case 'h':
+	    usage();
+	    return 0;
 	case 'k': {
 	    size_t len = strlen(optarg);
 	    dumpoptions.key = (char*)malloc(len+1+1);

From 6a8d5b931403af8d70a8872aaaa02d217146cc0a Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Fri, 17 Feb 2023 15:58:44 -0700
Subject: [PATCH 16/28] Remove a stray character at the head file.

---
 RELEASE_NOTES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 6bac6e56a..511e4f913 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,4 +1,4 @@
-1Release Notes       {#RELEASE_NOTES}
+Release Notes       {#RELEASE_NOTES}
 =============
 
 \brief Release notes file for the netcdf-c package.

From 5ae3655436393b31baac8fb8e0588dcfea01d0b4 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Tue, 21 Feb 2023 15:02:14 -0700
Subject: [PATCH 17/28] Fixing issues uncovered by compiling with
 '-fsanitize=undefined' and running nc_test/nc_test, in support of
 https://github.com/Unidata/netcdf-c/issues/1983, amongst others.  The cast as
 was being used was undefined behavior, and had to be worked around in a style
 approximating C++'s 'reinterpret_cast'

---
 nc_test/util.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nc_test/util.c b/nc_test/util.c
index 2687ab098..0cc4eaf91 100644
--- a/nc_test/util.c
+++ b/nc_test/util.c
@@ -170,8 +170,8 @@ equal(const double x,
         /* because in-memory data type char can be signed or unsigned,
          * type cast the value from external NC_CHAR before the comparison
          */
-        char x2 = (char) x;
-        char y2 = (char) y;
+        char x2 = *(char *)&x;
+        char y2 = *(char *)&y;
         return ABS(x2-y2) <= epsilon * MAX( ABS(x2), ABS(y2));
     }
 
@@ -194,8 +194,8 @@ equal2(const double x,
         /* because in-memory data type char can be signed or unsigned,
          * type cast the value from external NC_CHAR before the comparison
          */
-        char x2 = (char) x;
-        char y2 = (char) y;
+        char x2 = *(char *)&x;
+        char y2 = *(char *)&y;
         return ABS(x2-y2) <= epsilon * MAX( ABS(x2), ABS(y2));
     }
 

From df7f6ec5719a5ce89f4de129420c1d8c5c1f8161 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Tue, 21 Feb 2023 16:54:51 -0700
Subject: [PATCH 18/28] Correct undefined variable error.

---
 nc_test/util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nc_test/util.c b/nc_test/util.c
index 0cc4eaf91..3febb7e06 100644
--- a/nc_test/util.c
+++ b/nc_test/util.c
@@ -969,7 +969,7 @@ check_dims(int  ncid)
 void
 check_vars(int  ncid)
 {
-    size_t index[MAX_RANK];
+    size_t index[MAX_RANK] = {0};
     char  text, name[NC_MAX_NAME];
     int  i, err;		/* status */
     size_t  j;

From 776282348389f41b2fb323588af452a4f9c97b87 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Tue, 21 Feb 2023 16:58:28 -0700
Subject: [PATCH 19/28] Correct another uninitialized issue.

---
 nc_test/util.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nc_test/util.c b/nc_test/util.c
index 3febb7e06..9e46d88fe 100644
--- a/nc_test/util.c
+++ b/nc_test/util.c
@@ -413,8 +413,8 @@ int dbl2nc ( const double d, const nc_type xtype, void *p)
 double
 hash( const nc_type xtype, const int rank, const size_t *index )
 {
-    double base;
-    double result;
+    double base = 0;
+    double result = 0;
     int  d;       /* index of dimension */
 
 	/* If vector then elements 0 & 1 are min & max. Elements 2 & 3 are */

From b7635f061fc044072626f460c43d1c0155033fcd Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Fri, 24 Feb 2023 11:27:36 -0700
Subject: [PATCH 20/28] Fixed an issue where memcpy was potentially passed a
 null pointer.

---
 libsrc/var.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/libsrc/var.c b/libsrc/var.c
index 00f374882..f09bbe27b 100644
--- a/libsrc/var.c
+++ b/libsrc/var.c
@@ -175,10 +175,12 @@ dup_NC_var(const NC_var *rvarp)
 		return NULL;
 	}
 
-	(void) memcpy(varp->shape, rvarp->shape,
-			 rvarp->ndims * sizeof(size_t));
-	(void) memcpy(varp->dsizes, rvarp->dsizes,
-			 rvarp->ndims * sizeof(off_t));
+	if(rvarp->shape != NULL)
+		(void) memcpy(varp->shape, rvarp->shape,
+				 rvarp->ndims * sizeof(size_t));
+	if(rvarp->dsizes != NULL)
+		(void) memcpy(varp->dsizes, rvarp->dsizes,
+				 rvarp->ndims * sizeof(off_t));
 	varp->xsz = rvarp->xsz;
 	varp->len = rvarp->len;
 	varp->begin = rvarp->begin;

From 0c45c396073348cd5d2ae0ff04b836f5bb38286a Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Fri, 24 Feb 2023 11:48:00 -0700
Subject: [PATCH 21/28] More issues returned by sanitizer, related to attempts
 to assign MAX_UNSIGNED_CHAR (255) to a variable of type char.

---
 nc_test/util.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nc_test/util.c b/nc_test/util.c
index 9e46d88fe..b873f87bf 100644
--- a/nc_test/util.c
+++ b/nc_test/util.c
@@ -343,7 +343,7 @@ int dbl2nc ( const double d, const nc_type xtype, void *p)
              * reporting it as a range error.
              */
             if ( r < X_CHAR_MIN || r > X_CHAR_MAX ) return 2;
-            *((signed char*) p) = (signed char)r;
+            *((unsigned char*) p) = (unsigned char)r;
             break;
         case NC_BYTE:
             r = floor(0.5+d);
@@ -1006,7 +1006,7 @@ check_vars(int  ncid)
           	err = nc_get_var1_text(ncid, i, index, &text);
             IF (err)
 		    error("nc_get_var1_text: %s", nc_strerror(err));
-            IF (text != (char)expect) {
+            IF ((unsigned char)text != (unsigned char)expect) {
               error("Var %s [%lu] value read %hhd not that expected %g ",
                   var_name[i], j, text, expect);
 		    print_n_size_t(var_rank[i], index);
@@ -1073,7 +1073,7 @@ check_atts(int  ncid)
 		    error("nc_get_att_text: %s", nc_strerror(err));
 		for (k = 0; k < ATT_LEN(i,j); k++) {
 		    expect = hash(xtype, -1, &k);
-		    IF (text[k] != (char)expect) {
+		    IF ((unsigned char)text[k] != (unsigned char)expect) {
 			error("nc_get_att_text: unexpected value");
             	    } else {
               		nok++;

From 1d908e29ac3d8076cc585e5c7e8dd79ebdf9c626 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Fri, 24 Feb 2023 13:37:28 -0700
Subject: [PATCH 22/28] Explicit cast to unsigned char.

---
 nc_test/util.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nc_test/util.c b/nc_test/util.c
index b873f87bf..439976375 100644
--- a/nc_test/util.c
+++ b/nc_test/util.c
@@ -841,7 +841,7 @@ put_atts(int ncid)
 	for (j = 0; j < NATTS(i); j++) {
 	    if (ATT_TYPE(i,j) == NC_CHAR) {
 		for (k = 0; k < ATT_LEN(i,j); k++) {
-                    catt[k] = (char) hash(ATT_TYPE(i,j), -1, &k);
+                    catt[k] = (unsigned char) hash(ATT_TYPE(i,j), -1, &k);
 		}
 		err = nc_put_att_text(ncid, i, ATT_NAME(i,j),
 		    ATT_LEN(i,j), catt);
@@ -1074,7 +1074,8 @@ check_atts(int  ncid)
 		for (k = 0; k < ATT_LEN(i,j); k++) {
 		    expect = hash(xtype, -1, &k);
 		    IF ((unsigned char)text[k] != (unsigned char)expect) {
-			error("nc_get_att_text: unexpected value");
+            error("Var %s [%lu] value read %hhd not that expected %g ",
+                  var_name[i], j, text, expect);
             	    } else {
               		nok++;
             	    }

From 1e2abd11a5e100ec2fc572b2c6fe2903aa3b7897 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Mon, 27 Feb 2023 13:15:00 -0700
Subject: [PATCH 23/28] Update the version of the cache action used by github
 action from v2 to v3.

---
 .github/workflows/run_tests_osx.yml        | 20 ++++-----
 .github/workflows/run_tests_ubuntu.yml     | 50 ++++++++++++----------
 .github/workflows/run_tests_win_cygwin.yml |  2 +-
 .github/workflows/run_tests_win_mingw.yml  |  2 +-
 4 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/run_tests_osx.yml b/.github/workflows/run_tests_osx.yml
index 11864a801..21932fdb4 100644
--- a/.github/workflows/run_tests_osx.yml
+++ b/.github/workflows/run_tests_osx.yml
@@ -21,14 +21,14 @@ jobs:
 
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
         ###
         # libhdf5
         ###
       - name: Cache libhdf5-${{ runner.os }}-${{ matrix.hdf5 }}
         id: cache-hdf5-osx
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/environments/${{ matrix.hdf5 }}
           key: hdf5-${{ runner.os }}-${{ matrix.hdf5 }}
@@ -61,7 +61,7 @@ jobs:
         use_nczarr: [ nczarr_off, nczarr_on ]
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
 ###
 # Set Environmental Variables
@@ -93,7 +93,7 @@ jobs:
 
       - name: Fetch HDF Cache
         id: cache-hdf-osx
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/environments/${{ matrix.hdf5 }}
           key: hdf5-${{ runner.os }}-${{ matrix.hdf5 }}
@@ -167,7 +167,7 @@ jobs:
         use_nczarr: [ nczarr_off, nczarr_on ]
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
 ###
 # Set Environmental Variables
@@ -199,7 +199,7 @@ jobs:
 
       - name: Fetch HDF Cache
         id: cache-hdf5-osx
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/environments/${{ matrix.hdf5 }}
           key: hdf5-${{ runner.os }}-${{ matrix.hdf5 }}
@@ -260,7 +260,7 @@ jobs:
         hdf5: [ 1.12.2 ]
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
 ###
 # Set Environmental Variables
@@ -277,7 +277,7 @@ jobs:
 
       - name: Fetch HDF Cache
         id: cache-hdf-osx
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/environments/${{ matrix.hdf5 }}
           key: hdf5-${{ runner.os }}-${{ matrix.hdf5 }}
@@ -342,7 +342,7 @@ jobs:
 
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
 ###
 # Set Environmental Variables
@@ -357,7 +357,7 @@ jobs:
 
       - name: Fetch HDF Cache
         id: cache-hdf5-osx
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/environments/${{ matrix.hdf5 }}
           key: hdf5-${{ runner.os }}-${{ matrix.hdf5 }}
diff --git a/.github/workflows/run_tests_ubuntu.yml b/.github/workflows/run_tests_ubuntu.yml
index 9df8b7048..816367990 100644
--- a/.github/workflows/run_tests_ubuntu.yml
+++ b/.github/workflows/run_tests_ubuntu.yml
@@ -18,7 +18,7 @@ jobs:
 
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install System dependencies
         shell: bash -l {0}
@@ -29,7 +29,7 @@ jobs:
         ###
       - name: Cache libhdf5-${{ matrix.hdf5 }}
         id: cache-hdf5
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/environments/${{ matrix.hdf5 }}
           key: hdf5-${{ runner.os }}-${{ matrix.hdf5 }}
@@ -67,7 +67,7 @@ jobs:
 
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install System dependencies
         shell: bash -l {0}
@@ -78,7 +78,7 @@ jobs:
         ###
       - name: Cache libhdf5-parallel-${{ matrix.hdf5 }}
         id: cache-hdf5
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/environments/${{ matrix.hdf5 }}
           key: hdf5-parallel-${{ runner.os }}-${{ matrix.hdf5 }}
@@ -128,7 +128,7 @@ jobs:
         hdf5: [ 1.12.2 ]
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install System dependencies
         shell: bash -l {0}
@@ -149,7 +149,7 @@ jobs:
 
       - name: Fetch HDF Cache
         id: cache-hdf
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/environments/${{ matrix.hdf5 }}
           key: hdf5-${{ runner.os }}-${{ matrix.hdf5 }}
@@ -208,7 +208,7 @@ jobs:
         hdf5: [ 1.12.2 ]
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install System dependencies
         shell: bash -l {0}
@@ -224,7 +224,7 @@ jobs:
 
       - name: Fetch HDF Cache
         id: cache-hdf
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/environments/${{ matrix.hdf5 }}
           key: hdf5-parallel-${{ runner.os }}-${{ matrix.hdf5 }}
@@ -289,7 +289,7 @@ jobs:
 
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install System dependencies
         shell: bash -l {0}
@@ -308,7 +308,7 @@ jobs:
 
       - name: Fetch HDF Cache
         id: cache-hdf5
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/environments/${{ matrix.hdf5 }}
           key: hdf5-${{ runner.os }}-${{ matrix.hdf5 }}
@@ -369,7 +369,7 @@ jobs:
 
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install System dependencies
         shell: bash -l {0}
@@ -388,7 +388,7 @@ jobs:
 
       - name: Fetch HDF Cache
         id: cache-hdf5
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/environments/${{ matrix.hdf5 }}
           key: hdf5-parallel-${{ runner.os }}-${{ matrix.hdf5 }}
@@ -448,7 +448,7 @@ jobs:
         use_nczarr: [ nczarr_off, nczarr_on ]
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install System dependencies
         shell: bash -l {0}
@@ -482,7 +482,7 @@ jobs:
 
       - name: Fetch HDF Cache
         id: cache-hdf
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/environments/${{ matrix.hdf5 }}
           key: hdf5-${{ runner.os }}-${{ matrix.hdf5 }}
@@ -501,31 +501,37 @@ jobs:
 
       - name: Configure
         shell: bash -l {0}
-        run: CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ./configure ${ENABLE_HDF5} ${ENABLE_DAP} ${ENABLE_NCZARR}
+        run: |
+          current_directory="$(pwd)"
+          mkdir ../build
+          cd ../build && CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} "${current_directory}/configure" ${ENABLE_HDF5} ${ENABLE_DAP} ${ENABLE_NCZARR}
         if: ${{ success() }}
 
       - name: Look at config.log if error
         shell: bash -l {0}
-        run: cat config.log
+        run: cd ../build && cat config.log
         if: ${{ failure() }}
 
       - name: Print Summary
         shell: bash -l {0}
-        run: cat libnetcdf.settings
+        run: cd ../build && cat libnetcdf.settings
 
       - name: Build Library and Utilities
         shell: bash -l {0}
-        run: CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make -j
+        run: |
+          cd ../build && CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make -j
         if: ${{ success() }}
 
       - name: Build Tests
         shell: bash -l {0}
-        run: CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make check TESTS="" -j
+        run: |
+          cd ../build && CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make check TESTS="" -j
         if: ${{ success() }}
 
       - name: Run Tests
         shell: bash -l {0}
-        run: CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make check -j
+        run: |
+          cd ../build && CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make check -j
         if: ${{ success() }}
 
   nc-cmake:
@@ -541,7 +547,7 @@ jobs:
         use_nczarr: [ nczarr_off, nczarr_on ]
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install System dependencies
         shell: bash -l {0}
@@ -575,7 +581,7 @@ jobs:
 
       - name: Fetch HDF Cache
         id: cache-hdf5
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/environments/${{ matrix.hdf5 }}
           key: hdf5-${{ runner.os }}-${{ matrix.hdf5 }}
diff --git a/.github/workflows/run_tests_win_cygwin.yml b/.github/workflows/run_tests_win_cygwin.yml
index d3e4f5c88..bfd642f50 100644
--- a/.github/workflows/run_tests_win_cygwin.yml
+++ b/.github/workflows/run_tests_win_cygwin.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Fix line endings
         run: git config --global core.autocrlf input
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: cygwin/cygwin-install-action@v2
         with:
diff --git a/.github/workflows/run_tests_win_mingw.yml b/.github/workflows/run_tests_win_mingw.yml
index d87212859..11f066be6 100644
--- a/.github/workflows/run_tests_win_mingw.yml
+++ b/.github/workflows/run_tests_win_mingw.yml
@@ -22,7 +22,7 @@ jobs:
 
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64

From a1d5e98896f11cf5f3d51d63bb18d7c1e342dc8b Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Mon, 27 Feb 2023 13:34:26 -0700
Subject: [PATCH 24/28] Turn nczarr zip support off by default in cmake, add a
 status line indicating whether nczarr-zip-support is available, in
 libnetcdf.settings.

---
 CMakeLists.txt        | 4 +++-
 configure.ac          | 9 ++++-----
 libnetcdf.settings.in | 3 ++-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb40488a2..d8ee552b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1215,7 +1215,7 @@ ELSE() # No option specified
 ENDIF()
 
 # Try to enable NCZarr zip support
-OPTION(ENABLE_NCZARR_ZIP "Enable NCZarr ZIP support." ON)
+OPTION(ENABLE_NCZARR_ZIP "Enable NCZarr ZIP support." OFF)
 IF (ENABLE_NCZARR_ZIP)
   FIND_PACKAGE(Zip REQUIRED)
   INCLUDE_DIRECTORIES(${Zip_INCLUDE_DIRS})
@@ -2537,6 +2537,7 @@ is_enabled(HDF5_HAS_PAR_FILTERS HAS_PAR_FILTERS)
 is_enabled(ENABLE_NCZARR_S3 HAS_NCZARR_S3)
 is_enabled(ENABLE_NCZARR HAS_NCZARR)
 is_enabled(ENABLE_NCZARR_S3_TESTS DO_NCZARR_S3_TESTS)
+is_enabled(ENABLE_NCZARR_ZIP HAS_NCZARR_ZIP)
 is_enabled(ENABLE_MULTIFILTERS HAS_MULTIFILTERS)
 is_enabled(ENABLE_NCZARR_ZIP DO_NCZARR_ZIP_TESTS)
 is_enabled(ENABLE_QUANTIZE HAS_QUANTIZE)
@@ -2548,6 +2549,7 @@ is_enabled(HAVE_ZSTD HAS_ZSTD)
 is_enabled(HAVE_BLOSC HAS_BLOSC)
 is_enabled(HAVE_BZ2 HAS_BZ2)
 
+
 # Generate file from template.
 CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libnetcdf.settings.in"
   "${CMAKE_CURRENT_BINARY_DIR}/libnetcdf.settings"
diff --git a/configure.ac b/configure.ac
index 81a75ea31..cff51e0ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -779,20 +779,18 @@ AC_MSG_RESULT([${have_sz}])
 ##########
 
 # See if we have libzip for NCZarr
-AC_CHECK_LIB([zip],[zip_open],[have_zip=yes],[have_zip=no])
-if test "x$have_zip" = "xyes" ; then
-   AC_SEARCH_LIBS([zip_open],[zip zip.dll cygzip.dll], [], [])
-fi
+AC_SEARCH_LIBS([zip_open],[zip zip.dll cygzip.dll],[have_zip=yes],[have_zip=no])
 AC_MSG_CHECKING([whether libzip library is available])
 AC_MSG_RESULT([${have_zip}])
 
 enable_nczarr_zip=${have_zip} # alias
 
 if test "x$enable_nczarr" = xno ; then
-enable_nczarr_zip=no
+   enable_nczarr_zip=no
 fi
 
 
+
 AC_MSG_CHECKING([whether nczarr zip support is enabled])
 AC_MSG_RESULT([${enable_nczarr_zip}])
 
@@ -1932,6 +1930,7 @@ AC_SUBST([HAS_PAR_FILTERS], [$hdf5_supports_par_filters])
 AC_SUBST(HAS_NCZARR_S3,[$enable_nczarr_s3])
 AC_SUBST(HAS_NCZARR,[$enable_nczarr])
 AC_SUBST(DO_NCZARR_S3_TESTS,[$enable_nczarr_s3_tests])
+AC_SUBST(HAS_NCZARR_ZIP,[$enable_nczarr_zip])
 AC_SUBST(HAS_MULTIFILTERS,[$has_multifilters])
 AC_SUBST(DO_NCZARR_ZIP_TESTS,[$enable_nczarr_zip])
 AC_SUBST(HAS_QUANTIZE,[$enable_quantize])
diff --git a/libnetcdf.settings.in b/libnetcdf.settings.in
index b25d3b603..ea31a830d 100644
--- a/libnetcdf.settings.in
+++ b/libnetcdf.settings.in
@@ -39,8 +39,10 @@ PnetCDF Support:	@HAS_PNETCDF@
 DAP2 Support:		@HAS_DAP2@
 DAP4 Support:		@HAS_DAP4@
 Byte-Range Support:	@HAS_BYTERANGE@
+
 NCZarr Support:		@HAS_NCZARR@
 NCZarr S3 Support:      @HAS_NCZARR_S3@
+NCZarr Zip Support:     @HAS_NCZARR_ZIP@
 
 Diskless Support:	@HAS_DISKLESS@
 MMap Support:		@HAS_MMAP@
@@ -48,7 +50,6 @@ JNA Support:		@HAS_JNA@
 ERANGE Fill Support:	@HAS_ERANGE_FILL@
 Relaxed Boundary Check:	@RELAX_COORD_BOUND@
 
-NCZarr Support:		@HAS_NCZARR@
 Multi-Filter Support:	@HAS_MULTIFILTERS@
 Quantization:		@HAS_QUANTIZE@
 Logging:     		@HAS_LOGGING@

From 677587b4448f6245c997e97e85e187f0d2d9175a Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Mon, 27 Feb 2023 15:07:33 -0700
Subject: [PATCH 25/28] Fix issue with dangling test file not getting cleaned
 up.

---
 dap4_test/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dap4_test/Makefile.am b/dap4_test/Makefile.am
index 17eee31a3..27535c250 100644
--- a/dap4_test/Makefile.am
+++ b/dap4_test/Makefile.am
@@ -61,7 +61,7 @@ EXTRA_DIST = test_parse.sh test_meta.sh test_data.sh \
 CLEANFILES = *.exe
 # This should only be left behind if using parallel io
 CLEANFILES += tmp_*
-CLEANFILES += ${execdir}/baselinethredds/GOES16_CONUS_20170821_020218_0.47_1km_33.3N_91.4W.nc4.thredds
+CLEANFILES += ${srcdir}/baselinethredds/GOES16_CONUS_20170821_020218_0.47_1km_33.3N_91.4W.nc4.thredds
  
 DISTCLEANFILES = findtestserver4.c pingurl4.c
 

From 267b26f1239310ca7ba8304315834939f7cc9886 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Mon, 27 Feb 2023 15:12:14 -0700
Subject: [PATCH 26/28] Fix a logic error that was resulting in an easy-to-miss
 error when running configure.

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index be6835a59..3ac9dfc80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1224,7 +1224,7 @@ if test "x$enable_hdf5" = "xno" ; then
     enable_dap4=no
 fi
 
-if test "x$ISOSX" = xyes && "x$have_libxml2" = xno ; then
+if test "x$ISOSX" = xyes && test "x$have_libxml2" = xno ; then
   AC_MSG_ERROR([Error: OSX requires libxml2 => --disable-dap4.])
   enable_dap4=no
 fi

From 0ff269a4e0711d284800265ecd5b3b51322e03e6 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Mon, 27 Feb 2023 15:48:57 -0700
Subject: [PATCH 27/28] Correct a potential null pointer dereference.

---
 libdap4/d4parser.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libdap4/d4parser.c b/libdap4/d4parser.c
index 2101cc28d..4997ce876 100644
--- a/libdap4/d4parser.c
+++ b/libdap4/d4parser.c
@@ -494,6 +494,7 @@ parseVlenField(NCD4parser* parser, NCD4node* container, ncxml_t xml, NCD4node**
 	if((ret = parseVariable(parser,container,x,&field)))
 	    goto done;
     }
+    if(field == NULL) {ret = NC_EBADTYPE; goto done;}
     if(fieldp) *fieldp = field;
 done:
     return THROW(ret);

From b40f8ce36735e7431a70ffc7d37d1c0a60d66b7d Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Mon, 27 Feb 2023 16:07:36 -0700
Subject: [PATCH 28/28] Invert solution as discussed at
 https://github.com/Unidata/netcdf-c/pull/2618

---
 include/nc4internal.h  | 2 +-
 libhdf5/hdf5internal.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/nc4internal.h b/include/nc4internal.h
index 2833e0c5a..86cb223fe 100644
--- a/include/nc4internal.h
+++ b/include/nc4internal.h
@@ -288,7 +288,7 @@ typedef struct NC_FILE_INFO
 {
     NC_OBJ hdr;
     NC *controller; /**< Pointer to containing NC. */
-#ifdef USE_PARALLEL4
+#ifdef USE_PARALLEL
     MPI_Comm comm;  /**< Copy of MPI Communicator used to open the file. */
     MPI_Info info;  /**< Copy of MPI Information Object used to open the file. */
 #endif
diff --git a/libhdf5/hdf5internal.c b/libhdf5/hdf5internal.c
index fa13ebbef..83add362d 100644
--- a/libhdf5/hdf5internal.c
+++ b/libhdf5/hdf5internal.c
@@ -163,7 +163,7 @@ find_var_dim_max_length(NC_GRP_INFO_T *grp, int varid, int dimid,
                 if (var->dimids[d] == dimid)
                     *maxlen = *maxlen > h5dimlen[d] ? *maxlen : h5dimlen[d];
 
-#ifdef USE_PARALLEL4
+#ifdef USE_PARALLEL
 	    /* If we are doing parallel I/O in collective mode (with
 	     * either pnetcdf or HDF5), then communicate with all
 	     * other tasks in the collective and find out which has