Accepting request 1301786 from science

OBS-URL: https://build.opensuse.org/request/show/1301786
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/netcdf?expand=0&rev=71

Fix-spurious-uninitialized-variable-warning.patch

@@ -117,10 +117,10 @@ Index: netcdf-c-4.9.2/nczarr_test/ncdumpchunks.c
 ===================================================================
 --- netcdf-c-4.9.2.orig/nczarr_test/ncdumpchunks.c
 +++ netcdf-c-4.9.2/nczarr_test/ncdumpchunks.c
-@@ -303,7 +303,7 @@ dump(Format* format)
+@@ -345,7 +345,7 @@ dump(Format* format)
      char sindices[64];
  #ifdef H5
-     int i;
+     size_t i;
 -    hid_t fileid, grpid, datasetid;
 +    hid_t fileid = H5P_DEFAULT, grpid = H5P_DEFAULT, datasetid = H5P_DEFAULT; /* GCC */
      hid_t dxpl_id = H5P_DEFAULT; /*data transfer property list */

NCD4_dumpbytes-Add-missing-initialization-of-float-types.patch

@@ -1,26 +0,0 @@
-From: Egbert Eich <eich@suse.com>
-Date: Mon Jul 12 08:24:58 2021 +0200
-Subject: NCD4_dumpbytes(): Add missing initialization of float types
-Patch-mainline: Not yet
-Git-repo: https://github.com/Unidata/netcdf-c
-Git-commit: 429efb0b136d35c54f9db23f3c6affa1087514d2
-References: 
-
-Signed-off-by: Egbert Eich <eich@suse.com>
-Signed-off-by: Egbert Eich <eich@suse.de>
----
- libdap4/d4dump.c | 2 ++
- 1 file changed, 2 insertions(+)
-diff --git a/libdap4/d4dump.c b/libdap4/d4dump.c
-index b2e18931..442227ec 100644
---- a/libdap4/d4dump.c
-+++ b/libdap4/d4dump.c
-@@ -45,6 +45,8 @@ NCD4_dumpbytes(size_t size, const void* data0, int swap)
-         v.i32[0] = *((int*)pos);
-         v.u64[0] = *((unsigned long long*)pos);
-         v.i64[0] = *((long long*)pos);
-+	v.f32[0] = *((float*)pos);
-+	v.f64[0] = *((double*)pos);
- 	if(swap) {
- 	    swapinline16(v.u16);
- 	    swapinline32(v.u32);

netcdf-c-4.9.3.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a474149844e6144566673facf097fea253dc843c37bc0a7d3de047dc8adda5dd
+size 13236715

netcdf.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Aug 26 18:34:22 UTC 2025 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- update to 4.9.3:
+  * Extend the netcdf API to support programmatic changes to the
+    plugin search path.
+  * For complete changelog, see included RELEASE_NOTES.md, or
+    https://github.com/Unidata/netcdf-c/releases/tag/v4.9.3
+- Drop obsolete patches:
+  * parseServers-Fix-uninitialized-variable-simplify-error-path.patch
+  * NCD4_dumpbytes-Add-missing-initialization-of-float-types.patch
+- Rebase:
+  * pr_att-Fix-uninitialized-variable.patch
+  * Fix-spurious-uninitialized-variable-warning.patch
+
 -------------------------------------------------------------------
 Mon Mar 24 13:15:07 UTC 2025 - Nicolas Morey <nicolas.morey@suse.com>
 

netcdf.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package netcdf
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
 %define _do_check 1
 
 %define pname netcdf
-%define sonum   19
+%define sonum   22
 
 %bcond_with valgrind_checks
 # Keep disabled until properly set up on HDF5 library side
@@ -85,15 +85,13 @@ Name:           %{package_name}
 Summary:        Command-line programs for the NetCDF scientific data format
 License:        NetCDF
 Group:          Productivity/Scientific/Other
-Version:        4.9.2
+Version:        4.9.3
 Release:        0
 URL:            https://www.unidata.ucar.edu/software/netcdf/
 Source:         https://downloads.unidata.ucar.edu/netcdf-c/%{version}/%{pname}-c-%{version}.tar.gz
 Source1:        nc-config.1.gz
-Patch6:         parseServers-Fix-uninitialized-variable-simplify-error-path.patch
 Patch8:         val_NC_check_voff-Fix-uninitialized-variable-warning.patch
 Patch9:         pr_att-Fix-uninitialized-variable.patch
-Patch10:        NCD4_dumpbytes-Add-missing-initialization-of-float-types.patch
 Patch11:        NCZ_def_var_chunking-make-sure-cs-is-set-before-used.patch
 Patch12:        Fix-spurious-uninitialized-variable-warning.patch
 

parseServers-Fix-uninitialized-variable-simplify-error-path.patch

@@ -1,40 +0,0 @@
-From: Egbert Eich <eich@suse.com>
-Date: Sat Jul 10 09:41:22 2021 +0200
-Subject: parseServers(): Fix uninitialized variable simplify error path
-Patch-mainline: Not yet
-Git-repo: https://github.com/Unidata/netcdf-c
-Git-commit: 06fbbbc78023abca48ae3a69aa409f7f0a4cf3a3
-References: 
-
-When rtslen == 0 code jumped to 'done' where it checked for rts being
-!= NULL. At this point, rts was not yet set.
-Fixed code paths eliminating unneeded tests and jumps.
-
-Signed-off-by: Egbert Eich <eich@suse.com>
-Signed-off-by: Egbert Eich <eich@suse.de>
----
- include/nctestserver.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/include/nctestserver.h b/include/nctestserver.h
-index 978210c8..e7b63b80 100644
---- a/include/nctestserver.h
-+++ b/include/nctestserver.h
-@@ -47,7 +47,7 @@ parseServers(const char* remotetestservers)
-     size_t rtslen = strlen(remotetestservers);
- 
-     /* Keep LGTM quiet */
--    if(rtslen > MAXREMOTETESTSERVERS) goto done;
-+    if(rtslen > MAXREMOTETESTSERVERS) return NULL;
-     list = (char**)malloc(sizeof(char*) * (int)(rtslen/2));
-     if(list == NULL) return NULL;
-     rts = strdup(remotetestservers);
-@@ -65,8 +65,8 @@ parseServers(const char* remotetestservers)
-     *l = NULL;
-     servers = list;
-     list = NULL;
-+    free(rts);
- done:
--    if(rts) free(rts);
-     if(list) free(list);
-     return servers;
- }

pr_att-Fix-uninitialized-variable.patch

@@ -18,7 +18,7 @@ index d333cc37..41f44683 100644
 --- a/ncdump/ncdump.c
 +++ b/ncdump/ncdump.c
 @@ -896,6 +896,7 @@ pr_att(
- 		   value = *((uint64_t *)data + i);
+		   value = (int64_t)*((uint64_t *)data + i);
  		   break;
  	       default:
 +		   value = 0; /* GCC */