[Git][debian-gis-team/hdf4][master] 8 commits: Update branch in gbp.conf & Vcs-Git URL.

Bas Couwenberg (@sebastic) gitlab at salsa.debian.org
Fri Nov 28 09:41:36 GMT 2025



Bas Couwenberg pushed to branch master at Debian GIS Project / hdf4


Commits:
d4777dfa by Bas Couwenberg at 2025-11-23T07:37:54+01:00
Update branch in gbp.conf & Vcs-Git URL.

- - - - -
bddbcaea by Bas Couwenberg at 2025-11-23T07:42:23+01:00
Add patch by Antonio Valentino to fix segfaults in rioxarray.

- - - - -
780e5227 by Bas Couwenberg at 2025-11-23T07:42:40+01:00
Set distribution to experimental.

- - - - -
96c325ed by Bas Couwenberg at 2025-11-23T08:13:25+01:00
Don't use test-build-validate-cleanup, fails where pbuilder --twice succeeds.

- - - - -
3ba39fe1 by Bas Couwenberg at 2025-11-27T08:22:30+01:00
Use GCC 14 on armhf to fix FTBFS. (closes: #1121240)

- - - - -
9bb5d8ff by Bas Couwenberg at 2025-11-27T08:22:45+01:00
Set distribution to experimental.

- - - - -
767f50f7 by Bas Couwenberg at 2025-11-28T10:30:24+01:00
Revert "Update branch in gbp.conf & Vcs-Git URL."

This reverts commit d4777dfacbc7c2407a851d82f8140c5956a26806.

- - - - -
92294f82 by Bas Couwenberg at 2025-11-28T10:31:21+01:00
Move from experimental to unstable.

- - - - -


6 changed files:

- debian/.gitlab-ci.yml
- debian/changelog
- debian/control
- + debian/patches/revert-memleak-changes-to-fix-segfaults.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/.gitlab-ci.yml
=====================================
@@ -2,8 +2,5 @@
 include:
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
 
-variables:
-  SALSA_CI_ENABLE_VALIDATE_PACKAGE_CLEAN_UP: 1
-
 reprotest:
   allow_failure: true


=====================================
debian/changelog
=====================================
@@ -1,4 +1,19 @@
-libhdf4 (4.3.1-2) UNRELEASED; urgency=medium
+libhdf4 (4.3.1-2) unstable; urgency=medium
+
+  * Team upload.
+  * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 28 Nov 2025 10:31:02 +0100
+
+libhdf4 (4.3.1-2~exp2) experimental; urgency=medium
+
+  * Team upload.
+  * Use GCC 14 on armhf to fix FTBFS.
+    (closes: #1121240)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 27 Nov 2025 08:22:32 +0100
+
+libhdf4 (4.3.1-2~exp1) experimental; urgency=medium
 
   * Team upload.
   * Add patch by Helmut Grohne to fix cross building.
@@ -6,8 +21,9 @@ libhdf4 (4.3.1-2) UNRELEASED; urgency=medium
   * Update lintian overrides.
   * Drop Rules-Requires-Root: no, default since dpkg 1.22.13.
   * Use test-build-validate-cleanup instead of test-build-twice.
+  * Add patch by Antonio Valentino to fix segfaults in rioxarray.
 
- -- Bas Couwenberg <sebastic at debian.org>  Thu, 28 Aug 2025 12:57:39 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 23 Nov 2025 07:42:28 +0100
 
 libhdf4 (4.3.1-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -8,6 +8,8 @@ Build-Depends: bison,
                chrpath,
                debhelper-compat (= 13),
                flex,
+               gcc-14 [armhf],
+               g++-14 [armhf],
                libaec-dev,
                libjpeg-dev,
                libtirpc-dev,


=====================================
debian/patches/revert-memleak-changes-to-fix-segfaults.patch
=====================================
@@ -0,0 +1,66 @@
+Description: Fix segfaults in rioxarray.
+ Partially reverts https://github.com/HDFGroup/hdf4/pull/826
+Author: Antonio Valentino <antonio.valentino at tiscali.it>
+Bug: https://github.com/HDFGroup/hdf4/issues/862
+
+--- a/mfhdf/libsrc/file.c
++++ b/mfhdf/libsrc/file.c
+@@ -115,8 +115,10 @@ NC_reset_maxopenfiles(intn req_max)
+                 HGOTO_DONE(-1);
+             }
+             else {
++                /*
+                 for (cdfi = 0; cdfi < max_NC_open; cdfi++)
+                     _cdfs[cdfi] = NULL;
++                */
+                 HGOTO_DONE(max_NC_open);
+             }
+         }
+@@ -412,6 +414,11 @@ ncabort(int cdfid)
+             if (handle->redefid == _ncdf - 1)
+                 _ncdf--;
+             handle->redefid = -1;
++            _curr_opened--; /* one less file currently opened */
++
++            /* if the _cdf list is empty, deallocate and reset it to NULL */
++            if (_ncdf == 0)
++                ncreset_cdflist();
+         }
+     }
+     else if (handle->flags & NC_RDWR) {
+@@ -452,7 +459,7 @@ ncabort(int cdfid)
+     _curr_opened--; /* one less file currently being opened */
+ 
+     /* if the _cdf list is empty, deallocate and reset it to NULL */
+-    if (_curr_opened == 0)
++    if (_ncdf == 0)
+         ncreset_cdflist();
+ 
+     return 0;
+@@ -835,7 +842,7 @@ NC_endef(int cdfid, NC *handle)
+             NC_free_cdf(handle);
+ 
+             /* if the _cdf list is empty, deallocate and reset it to NULL */
+-            if (_curr_opened == 0)
++            if (_ncdf == 0)
+                 ncreset_cdflist();
+ 
+             return -1;
+@@ -853,7 +860,7 @@ NC_endef(int cdfid, NC *handle)
+         handle->redefid = -1;
+ 
+         /* if the _cdf list is empty, deallocate and reset it to NULL */
+-        if (_curr_opened == 0)
++        if (_ncdf == 0)
+             ncreset_cdflist();
+     }
+ 
+@@ -923,7 +930,7 @@ ncclose(int cdfid)
+     _curr_opened--;
+ 
+     /* if the _cdf list is empty, deallocate and reset it to NULL */
+-    if (_curr_opened == 0)
++    if (_ncdf == 0)
+         ncreset_cdflist();
+     return 0;
+ }


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 reproducible-builds.patch
 cross.patch
+revert-memleak-changes-to-fix-segfaults.patch


=====================================
debian/rules
=====================================
@@ -18,6 +18,11 @@ DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 export DEB_CPPFLAGS_MAINT_APPEND = -I/usr/include/tirpc/
 export DEB_LDFLAGS_MAINT_APPEND = -ltirpc
 
+ifneq (,$(filter $(DEB_BUILD_ARCH),armhf))
+export CC=gcc-14
+export CXX=g++-14
+endif
+
 ifneq (,$(findstring verbose,$(DEB_BUILD_OPTIONS)))
    DH_VERBOSE=1
    export DH_VERBOSE



View it on GitLab: https://salsa.debian.org/debian-gis-team/hdf4/-/compare/fb736885678961884534b52ee8e5d4375a0fa15f...92294f8254fb03d7e09ca6576bb26176c2d3aa43

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/hdf4/-/compare/fb736885678961884534b52ee8e5d4375a0fa15f...92294f8254fb03d7e09ca6576bb26176c2d3aa43
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20251128/6577f7a7/attachment-0001.htm>


More information about the Pkg-grass-devel mailing list