Merge branch 'main' into bugfix

Author: dkjsone

.github/workflows/run_tests_osx.yml

@@ -16,7 +16,7 @@ jobs:
 
   build-deps-osx:
 
-    runs-on: macos-13
+    runs-on: macos-14
 
     strategy:
       matrix:
@@ -62,7 +62,7 @@ jobs:
   nc-autotools-osx:
 
     needs: [ nc-cmake-tests-oneoff-osx-shared, nc-cmake-tests-oneoff-osx-static, nc-ac-tests-oneoff-osx ]
-    runs-on: macos-13
+    runs-on: macos-14
 
     strategy:
       matrix:
@@ -125,7 +125,7 @@ jobs:
       ###
       - name: Install autoconf
         shell: bash -l {0}
-        run: brew install automake m4
+        run: brew install libtool autoconf automake coreutils m4
 
       - name: Run autoconf
         shell: bash -l {0}
@@ -175,7 +175,7 @@ jobs:
   nc-cmake-osx:
 
     needs: [ nc-cmake-tests-oneoff-osx-shared, nc-cmake-tests-oneoff-osx-static, nc-ac-tests-oneoff-osx ]
-    runs-on: macos-13
+    runs-on: macos-14
 
     strategy:
       matrix:
@@ -277,7 +277,7 @@ jobs:
   nc-ac-tests-oneoff-osx:
 
     needs: build-deps-osx
-    runs-on: macos-13
+    runs-on: macos-14
 
     strategy:
       matrix:
@@ -316,11 +316,20 @@ jobs:
 
       - name: Install autoconf
         shell: bash -l {0}
-        run: brew install automake
+        run: |
+          brew update
+          echo ""
+          echo "Checking installed packagesin homebrew"
+          brew list
+          echo ""
+          brew install libtool autoconf automake coreutils m4
 
       - name: Run autoconf
         shell: bash -l {0}
-        run: autoreconf -if
+        run: |
+          which autoreconf 
+          ls /opt/homebrew/share/aclocal
+          autoreconf -if
 
       - name: Configure
         shell: bash -l {0}
@@ -358,7 +367,7 @@ jobs:
   nc-cmake-tests-oneoff-osx-shared:
 
     needs: build-deps-osx
-    runs-on: macos-13
+    runs-on: macos-14
 
     strategy:
       matrix:
@@ -432,7 +441,7 @@ jobs:
   nc-cmake-tests-oneoff-osx-static:
 
     needs: build-deps-osx
-    runs-on: macos-13
+    runs-on: macos-14
 
     strategy:
       matrix:

CMakeLists.txt

@@ -1181,7 +1181,7 @@ CHECK_INCLUDE_file("io.h"      HAVE_IO_H)
 endif(MSVC)
 CHECK_INCLUDE_file("stdlib.h"  HAVE_STDLIB_H)
 CHECK_INCLUDE_file("ctype.h"   HAVE_CTYPE_H)
-CHECK_INCLUDE_file("sys/xattr_h" HAVE_SYS_XATTR_H)
+CHECK_INCLUDE_file("sys/xattr.h" HAVE_SYS_XATTR_H)
 CHECK_INCLUDE_file("stdarg.h"    HAVE_STDARG_H)
 CHECK_INCLUDE_file("strings.h"   HAVE_STRINGS_H)
 CHECK_INCLUDE_file("signal.h"    HAVE_SIGNAL_H)

RELEASE_NOTES.md

@@ -5,8 +5,13 @@ Release Notes       {#RELEASE_NOTES}
 
 This file contains a high-level description of this package's evolution. Releases are in reverse chronological order (most recent first). Note that, as of netcdf 4.2, the `netcdf-c++` and `netcdf-fortran` libraries have been separated into their own libraries.
 
-## 4.9.4 - TBD
+## 4.10.0 - TBD
 
+* Fix the problems around ncdap_test/test_manyurls.c. See [Github ????](https://github.com/Unidata/netcdf-c/issues/????) for more information. 
+* Fix bug in ncdump when printing FQNs ([Issue 3184](https://github.com/Unidata/netcdf-c/issues/3184)). See [Github ????](https://github.com/Unidata/netcdf-c/issues/????) for more information. 
+* Update `macOS` github runners from macos-13 to macos-14, due to deprecation. 
+* Fix an error compiling netCDF with AWS-S3-SDK support using cmake. See [Github 3155](https://github.com/Unidata/netcdf-c/issues/3155) for more information. 
+* Add new environmental logging variable for `netCDF4` related logging subsystem, `NC4LOGGING`.  If `libnetcdf` is compiled with logging enabled, logs can be enabled at runtime by setting this environmental variable to the desired log level.  
 * Clean up the S3 API for all non-libnczarr code. This continues the splitting of PR [Github #3068](https://github.com/Unidata/netcdf-c/pull/3068).
 See [Github #3090](https://github.com/Unidata/netcdf-c/pull/3090) for more information.
 * Step 1 in splitting PR [Github #3068](https://github.com/Unidata/netcdf-c/pull/3068). Update ncjson.[ch] and ncproplist.[ch]. Also fix references to old API. Also fix include/netcdf_ncjson.h and include/netcdf_proplist.h builds. See [Github #3086](https://github.com/Unidata/netcdf-c/pull/3086) for more information.

cmake/dependencies.cmake

@@ -446,7 +446,7 @@ if(NETCDF_ENABLE_S3)
     else(AWSSDK_FOUND)
       set(NETCDF_ENABLE_S3_AWS OFF CACHE BOOL "S3 AWS" FORCE)
     endif(AWSSDK_FOUND)
-  else(NETCDF_ENABLE_S3_INTERNAL)
+  else(NETCDF_ENABLE_S3_AWS)
     # Find crypto libraries required with testing with the internal s3 api.
     #find_library(SSL_LIB NAMES ssl openssl)
     find_package(OpenSSL REQUIRED)

config.h.cmake.in

@@ -148,6 +148,9 @@ are set when opening a binary file on Windows. */
 /* if true, build DAP4 Client */
 #cmakedefine NETCDF_ENABLE_DAP4 1
 
+/* if true, do long dap tests */
+#cmakedefine NETCDF_ENABLE_DAP_LONG_TESTS 1
+
 /* if true, do remote tests */
 #cmakedefine NETCDF_ENABLE_DAP_REMOTE_TESTS 1
 

configure.ac

@@ -734,6 +734,10 @@ AC_ARG_ENABLE([dap-long-tests],
                                  [enable dap long tests])])
 test "x$enable_dap_long_tests" = xyes || enable_dap_long_tests=no
 AC_MSG_RESULT([$enable_dap_long_tests])
+if test "x$enable_dap_long_tests" = xyes; then
+   AC_DEFINE([NETCDF_ENABLE_DAP_LONG_TESTS], [1], [if true, execute long dap tests])
+fi
+
 if test "x$enable_dap_remote_tests" = "xno" || test "x$enable_external_server_tests" = "xno" ; then
   AC_MSG_NOTICE([--disable-dap-remote|external-server-tests => --disable_dap_long_tests])
   enable_dap_long_tests=no
@@ -1390,7 +1394,7 @@ AC_MSG_NOTICE([checking types, headers, and functions])
 AC_CHECK_HEADERS([sys/param.h])
 AC_CHECK_HEADERS([libgen.h])
 #AC_CHECK_HEADERS([locale.h])
-AC_CHECK_HEADERS([locale.h stdio.h stdarg.h fcntl.h malloc.h stdlib.h string.h strings.h unistd.h sys/stat.h getopt.h sys/time.h sys/types.h time.h dirent.h stdint.h ctype.h sys/xattr_h])
+AC_CHECK_HEADERS([locale.h stdio.h stdarg.h fcntl.h malloc.h stdlib.h string.h strings.h unistd.h sys/stat.h getopt.h sys/time.h sys/types.h time.h dirent.h stdint.h ctype.h sys/xattr.h])
 
 # Do sys/resource.h separately
 #AC_CHECK_HEADERS([sys/resource.h],[havesysresource=1],[havesysresource=0])

docs/building-with-cmake.md

@@ -22,6 +22,7 @@ The following packages are required to build netCDF-C using CMake.
 
 * netCDF-C Source Code
 * CMake version 2.8.12 or greater.
+* m4
 * Optional Requirements:
 	* HDF5 Libraries for netCDF4/HDF5 support.
 	* libcurl for DAP support.

include/ncrc.h

@@ -16,6 +16,7 @@ and accessing rc files (e.g. .daprc).
 #include "ncuri.h"
 #include "nclist.h"
 #include "ncbytes.h"
+#include "ncs3sdk.h"
 
 /* getenv() keys */
 #define NCRCENVIGNORE "NCRCENV_IGNORE"

libdispatch/dinfermodel.c

@@ -1661,7 +1661,7 @@ isdaoscontainer(const char* path)
     }
 #else /*!HAVE_GETFATTR*/
     /* We just can't test for DAOS container.*/
-    stat = 0;
+    rc = 0;
 #endif /*HAVE_GETFATTR*/
 #endif /*HAVE_SYS_XATTR_H*/
     }

libdispatch/ds3util.c

@@ -761,7 +761,7 @@ NC_getdefaults3region(NCURI* uri, const char** regionp)
 	}
     }
     if(region == NULL)
-	  region = NC_getglobalstate()->aws.default_region; /* Force use of the Amazon default */
+	  region = (NC_getglobalstate()->aws.default_region ? NC_getglobalstate()->aws.default_region : "us-east-1"); /* Force use of the Amazon default */
 #ifdef AWSDEBUG
     fprintf(stderr,">>> activeregion = |%s|\n",region);
 #endif