From 5d35aae99867d37c80c4a657895ff29bf6b8f9a5 Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Thu, 16 Mar 2023 15:45:43 +0000 Subject: [PATCH] netcdf: Autospec creation for update from version 4.9.1 to version 4.9.2 Dennis Heimbigner (9): Modify H5FDhttp.c to work with HDF5 1.14.0 update release notes Enable ACCEPT_ENCODING on DAP requests Update Release notes Fix a distcheck failure with nczarr_test/run_interop.sh Extend the dispatch table for H5FD back to version 1.13.2 update RELEASENOTES Missed one occurrence of 1,14,0 Fix byterange handling of some URLS Greg Sjaardema (1): Missing `goto` Magnus Ulimoen (1): Fix setting dest for non-m4 path Mathieu Westphal (1): Avoid optionnaly depends on zip for NCZarr Sergey Kosukhin (1): Fix macro usage Ward Fisher (35): Update release notes, prepare to merge back upstream into development branch. Escape command symbol in doxygen template. Incorporate fix in support of https://github.com/Unidata/netcdf-c/pull/2437#issuecomment-1419381660 Update nc-config in support of https://github.com/Unidata/netcdf-c/issues/2274 Added benchmarking option to cmake-based builds, turned on unit-testing by default Wiring performance benchmarks into cmake, cleaned up serial compression performance test dependency on MPI. Correct typo in CMakeLists.txt Add generated parallel tests for nc_perf, cmake-based build system. Fix missing endif statement Add execute bit to test scripts Turn benchmarks off by default. They require netcdf4, additional logic is required in order to have them on by default. Remove a stray character at the head file. 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' Correct undefined variable error. Correct another uninitialized issue. Fixed an issue where memcpy was potentially passed a null pointer. More issues returned by sanitizer, related to attempts to assign MAX_UNSIGNED_CHAR (255) to a variable of type char. Explicit cast to unsigned char. Update the version of the cache action used by github action from v2 to v3. Turn nczarr zip support off by default in cmake, add a status line indicating whether nczarr-zip-support is available, in libnetcdf.settings. Fix issue with dangling test file not getting cleaned up. Fix a logic error that was resulting in an easy-to-miss error when running configure. Correct a potential null pointer dereference. Invert solution as discussed at https://github.com/Unidata/netcdf-c/pull/2618 Bumped SO version. Update release notes. Bump version strings to reflect next development version. Correct jsonconvention map with netcdf version. Add hdf5 1.14.0 to GitHub CI. Expand CI testing with HDF5 1.14.0 Set version strings. Adjust reference nczarr file for v4.9.2 release. Update .gitignore to allow generated files into version control for 4.9.2 release. Added generated files for release. Added generated test files for a stand-alone release. --- Makefile | 2 +- buildreq_cache | 2 +- configure_misses | 12 +++++++----- netcdf.spec | 22 +++++++++++----------- options.conf | 4 ++-- release | 2 +- upstream | 2 +- versions | 2 +- 8 files changed, 25 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index 0a4fabd..3e873a9 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PKG_NAME := netcdf -URL = https://github.com/Unidata/netcdf-c/archive/v4.9.1/netcdf-c-4.9.1.tar.gz +URL = https://github.com/Unidata/netcdf-c/archive/v4.9.2/netcdf-c-4.9.2.tar.gz ARCHIVES = include ../common/Makefile.common diff --git a/buildreq_cache b/buildreq_cache index d43b7dd..de4106c 100644 --- a/buildreq_cache +++ b/buildreq_cache @@ -1,4 +1,4 @@ -4.9.1 +4.9.2 bzip2-dev graphviz libxml2-dev diff --git a/configure_misses b/configure_misses index dd46a7c..d27156a 100644 --- a/configure_misses +++ b/configure_misses @@ -25,6 +25,8 @@ Configure miss: int64 Configure miss: int64 Configure miss: library containing H5Pset_fapl_ros3 Configure miss: library containing H5Pset_fapl_ros3 +Configure miss: library containing zip_open +Configure miss: library containing zip_open Configure miss: longlong Configure miss: longlong Configure miss: mpicc option to enable C11 features @@ -70,8 +72,10 @@ Configure miss: whether nczarr zip support is enabled Configure miss: whether nczarr zip support is enabled Configure miss: whether netCDF-4 logging is enabled Configure miss: whether netCDF-4 logging is enabled -Configure miss: whether netcdf zarr S3 support should be enabled -Configure miss: whether netcdf zarr S3 support should be enabled +Configure miss: whether netcdf NCZarr S3 support should be enabled +Configure miss: whether netcdf NCZarr S3 support should be enabled +Configure miss: whether netcdf S3 support should be enabled +Configure miss: whether netcdf S3 support should be enabled Configure miss: whether netcdf zarr S3 testing should be enabled Configure miss: whether netcdf zarr S3 testing should be enabled Configure miss: whether parallel I/O for classic files is to be enabled @@ -94,6 +98,4 @@ Configure miss: whether use of external servers should be enabled Configure miss: whether we should attempt to install netcdf-fortran (EXPERIMENTAL) Configure miss: whether we should attempt to install netcdf-fortran (EXPERIMENTAL) Configure miss: x86_64-generic-linux-gnu-file -Configure miss: x86_64-generic-linux-gnu-file -Configure miss: zip_open in -lzip -Configure miss: zip_open in -lzip \ No newline at end of file +Configure miss: x86_64-generic-linux-gnu-file \ No newline at end of file diff --git a/netcdf.spec b/netcdf.spec index d422706..a1f7e38 100644 --- a/netcdf.spec +++ b/netcdf.spec @@ -3,10 +3,10 @@ # Generated by: autospec.py # Name : netcdf -Version : 4.9.1 -Release : 16 -URL : https://github.com/Unidata/netcdf-c/archive/v4.9.1/netcdf-c-4.9.1.tar.gz -Source0 : https://github.com/Unidata/netcdf-c/archive/v4.9.1/netcdf-c-4.9.1.tar.gz +Version : 4.9.2 +Release : 17 +URL : https://github.com/Unidata/netcdf-c/archive/v4.9.2/netcdf-c-4.9.2.tar.gz +Source0 : https://github.com/Unidata/netcdf-c/archive/v4.9.2/netcdf-c-4.9.2.tar.gz Summary : NetCDF Client Library for C Group : Development/Tools License : BSD-3-Clause NetCDF Zlib bzip2-1.0.6 @@ -94,10 +94,10 @@ openmpi components for the netcdf package. %prep -%setup -q -n netcdf-c-4.9.1 -cd %{_builddir}/netcdf-c-4.9.1 +%setup -q -n netcdf-c-4.9.2 +cd %{_builddir}/netcdf-c-4.9.2 pushd .. -cp -a netcdf-c-4.9.1 build-openmpi +cp -a netcdf-c-4.9.2 build-openmpi popd %build @@ -105,7 +105,7 @@ export http_proxy=http://127.0.0.1:9/ export https_proxy=http://127.0.0.1:9/ export no_proxy=localhost,127.0.0.1,0.0.0.0 export LANG=C.UTF-8 -export SOURCE_DATE_EPOCH=1675791517 +export SOURCE_DATE_EPOCH=1678981530 export GCC_IGNORE_WERROR=1 export CFLAGS="$CFLAGS -fdebug-types-section -femit-struct-debug-baseonly -fno-lto -g1 -gno-column-info -gno-variable-location-views -gz " export FCFLAGS="$FFLAGS -fdebug-types-section -femit-struct-debug-baseonly -fno-lto -g1 -gno-column-info -gno-variable-location-views -gz " @@ -155,7 +155,7 @@ make %{?_smp_mflags} check || : module unload openmpi %install -export SOURCE_DATE_EPOCH=1675791517 +export SOURCE_DATE_EPOCH=1678981530 rm -rf %{buildroot} mkdir -p %{buildroot}/usr/share/package-licenses/netcdf cp %{_builddir}/netcdf-c-%{version}/COPYRIGHT %{buildroot}/usr/share/package-licenses/netcdf/1b45343da188e7ec176d9443c8c3312798532bfc || : @@ -214,7 +214,7 @@ popd %files lib %defattr(-,root,root,-) /usr/lib64/libnetcdf.so.19 -/usr/lib64/libnetcdf.so.19.2.1 +/usr/lib64/libnetcdf.so.19.2.2 %files license %defattr(0644,root,root,0755) @@ -240,7 +240,7 @@ popd /usr/lib64/openmpi/bin/ncgen3 /usr/lib64/openmpi/bin/ocprint /usr/lib64/openmpi/lib/libnetcdf.so.19 -/usr/lib64/openmpi/lib/libnetcdf.so.19.2.1 +/usr/lib64/openmpi/lib/libnetcdf.so.19.2.2 /usr/lib64/openmpi/share/man/man1/nccopy.1 /usr/lib64/openmpi/share/man/man1/ncdump.1 /usr/lib64/openmpi/share/man/man1/ncgen.1 diff --git a/options.conf b/options.conf index a2a1f96..9894a92 100644 --- a/options.conf +++ b/options.conf @@ -1,6 +1,6 @@ [package] name = netcdf -url = https://github.com/Unidata/netcdf-c/archive/v4.9.1/netcdf-c-4.9.1.tar.gz +url = https://github.com/Unidata/netcdf-c/archive/v4.9.2/netcdf-c-4.9.2.tar.gz archives = giturl = https://github.com/Unidata/netcdf-c.git domain = @@ -14,7 +14,7 @@ allow_test_failures = true # unset %build ld_as_needed variable asneeded = false # this package is trusted enough to automatically update (used by other tools) -autoupdate = false +autoupdate = true # extend flags with '-std=gnu++98 broken_c++ = false # disable parallelization during build diff --git a/release b/release index b6a7d89..98d9bcb 100644 --- a/release +++ b/release @@ -1 +1 @@ -16 +17 diff --git a/upstream b/upstream index 74b3be5..03fb7b9 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -8e199954712ea317b0f5cedbdda50a4377b62834/netcdf-c-4.9.1.tar.gz +0eb6fdcbd725bd53bb9e98405a2cb15f3c511ce2/netcdf-c-4.9.2.tar.gz diff --git a/versions b/versions index 5b341fd..dad10c7 100644 --- a/versions +++ b/versions @@ -1 +1 @@ -4.9.1 +4.9.2