Bas Couwenberg pushed to branch master at Debian GIS Project / netcdf
Commits: fee3775f by Bas Couwenberg at 2023-12-13T18:33:51+01:00 Add upstream patch to finalize HDF5 library at exit. (closes: #1058621) - - - - - 3 changed files: - debian/changelog - + debian/patches/h5fd_http_finalize.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +netcdf (1:4.9.2-3) UNRELEASED; urgency=medium + + * Add upstream patch to finalize HDF5 library at exit. + (closes: #1058621) + + -- Bas Couwenberg <[email protected]> Wed, 13 Dec 2023 18:32:30 +0100 + netcdf (1:4.9.2-2) unstable; urgency=medium * Remove generated files in clean target. ===================================== debian/patches/h5fd_http_finalize.patch ===================================== @@ -0,0 +1,76 @@ +Description: Add H5FD_http_finalize function and call on hdf5 finalize +Author: JohnD <[email protected]> +Origin: https://github.com/Unidata/netcdf-c/pull/2827 +Bug: https://github.com/Unidata/netcdf-c/issues/2617 +Bug-Debian: https://bugs.debian.org/1058621 + +--- a/libhdf5/H5FDhttp.c ++++ b/libhdf5/H5FDhttp.c +@@ -240,6 +240,31 @@ H5FD_http_init(void) + } /* end H5FD_http_init() */ + + ++/*------------------------------------------------------------------------- ++ * Function: H5FD_http_finalize ++ * ++ * Purpose: Free this driver by unregistering the driver with the ++ * library. ++ * ++ * Returns: Non-negative on success or negative on failure ++ * ++ * Programmer: John Donoghue ++ * Tuesday, December 12, 2023 ++ * ++ *------------------------------------------------------------------------- ++ */ ++EXTERNL hid_t ++H5FD_http_finalize(void) ++{ ++ /* Reset VFL ID */ ++ if (H5FD_HTTP_g) ++ H5FDunregister(H5FD_HTTP_g); ++ H5FD_HTTP_g = 0; ++ ++ return H5FD_HTTP_g; ++} /* end H5FD_http_finalize() */ ++ ++ + /*--------------------------------------------------------------------------- + * Function: H5FD_http_term + * +@@ -256,9 +281,6 @@ H5FD_http_init(void) + static herr_t + H5FD_http_term(void) + { +- /* Reset VFL ID */ +- H5FD_HTTP_g = 0; +- + return 0; + } /* end H5FD_http_term() */ + #endif +--- a/libhdf5/H5FDhttp.h ++++ b/libhdf5/H5FDhttp.h +@@ -44,9 +44,11 @@ extern "C" { + + #if 0 + H5_DLL hid_t H5FD_http_init(void); ++H5_DLL hid_t H5FD_http_finalize(void); + H5_DLL herr_t H5Pset_fapl_http(hid_t fapl_id); + #else + EXTERNL hid_t H5FD_http_init(void); ++EXTERNL hid_t H5FD_http_finalize(void); + EXTERNL herr_t H5Pset_fapl_http(hid_t fapl_id); + #endif + +--- a/libhdf5/hdf5dispatch.c ++++ b/libhdf5/hdf5dispatch.c +@@ -142,6 +142,9 @@ NC_HDF5_initialize(void) + int + NC_HDF5_finalize(void) + { ++#ifdef ENABLE_BYTERANGE ++ (void)H5FD_http_finalize(); ++#endif + (void)nc4_hdf5_finalize(); + return NC_NOERR; + } ===================================== debian/patches/series ===================================== @@ -4,3 +4,4 @@ tst_fileinfo-link-hdf5.patch reproducible-settings.patch byteswap.patch doxygen-1.9.8.patch +h5fd_http_finalize.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/netcdf/-/commit/fee3775fa333b7af872182142d0c5d779ffc235d -- View it on GitLab: https://salsa.debian.org/debian-gis-team/netcdf/-/commit/fee3775fa333b7af872182142d0c5d779ffc235d You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
