Bas Couwenberg pushed to branch experimental at Debian GIS Project / gdal
Commits: 72adda69 by Bas Couwenberg at 2026-05-05T05:46:42+02:00 New upstream version 3.13.0~rc2+dfsg - - - - - 809adf7e by Bas Couwenberg at 2026-05-05T05:46:54+02:00 Update upstream source from tag 'upstream/3.13.0_rc2+dfsg' Update to upstream version '3.13.0~rc2+dfsg' with Debian dir c3a020cecabdd6cb897ceb1bad8b07b2b6f17ed5 - - - - - f6e04ae3 by Bas Couwenberg at 2026-05-05T05:50:30+02:00 New upstream release candidate. - - - - - 1d1234e3 by Bas Couwenberg at 2026-05-05T06:07:09+02:00 Update symbols for amd64. - - - - - e18d0f85 by Bas Couwenberg at 2026-05-05T06:07:09+02:00 Set distribution to experimental. - - - - - 5 changed files: - NEWS.md - debian/changelog - debian/libgdal39.symbols - gcore/gdaldllmain.cpp - port/cpl_vsil_curl.cpp Changes: ===================================== NEWS.md ===================================== @@ -42,6 +42,7 @@ GDAL 3.12.x bugfix release. ## New installed files * Include files: + gdal_mem.h gdal_thread_pool.h ogr_refcountedptr.h ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +gdal (3.13.0~rc2+dfsg-1~exp1) experimental; urgency=medium + + * New upstream release candidate. + * Update symbols for amd64. + + -- Bas Couwenberg <[email protected]> Tue, 05 May 2026 05:51:10 +0200 + gdal (3.13.0~rc1+dfsg-1~exp1) experimental; urgency=medium * New upstream release candidate. ===================================== debian/libgdal39.symbols ===================================== @@ -1,4 +1,4 @@ -# SymbolsHelper-Confirmed: 3.13.0~rc1 amd64 +# SymbolsHelper-Confirmed: 3.13.0~rc2 amd64 libgdal.so.39 #PACKAGE# #MINVER# * Build-Depends-Package: libgdal-dev BSBClose@Base 1.8.0 @@ -936,6 +936,7 @@ libgdal.so.39 #PACKAGE# #MINVER# GDALInvGeoTransform@Base 1.8.0 GDALInvHomography@Base 3.11.0 GDALIsInGlobalDestructor@Base 1.10.1 + GDALIsInGlobalDestructorFromDLLMain@Base 3.13.0~rc2 GDALIsLineOfSightVisible@Base 3.9.0 GDALIsMaskBand@Base 3.5.0 GDALIsValueExactAs@Base 3.10.0 ===================================== gcore/gdaldllmain.cpp ===================================== @@ -22,13 +22,21 @@ #include "ogr_api.h" static bool bInGDALGlobalDestructor = false; +static bool bInGDALGlobalDestructorFromDLLMain = false; + extern "C" int CPL_DLL GDALIsInGlobalDestructor(); +extern "C" bool CPL_DLL GDALIsInGlobalDestructorFromDLLMain(); int GDALIsInGlobalDestructor() { return bInGDALGlobalDestructor; } +bool GDALIsInGlobalDestructorFromDLLMain() +{ + return bInGDALGlobalDestructorFromDLLMain; +} + void CPLFinalizeTLS(); static bool bGDALDestroyAlreadyCalled = FALSE; @@ -130,6 +138,7 @@ extern "C" int WINAPI DllMain(HINSTANCE /* hInstance */, DWORD dwReason, } else if (dwReason == DLL_PROCESS_DETACH) { + bInGDALGlobalDestructorFromDLLMain = true; GDALDestroy(); } ===================================== port/cpl_vsil_curl.cpp ===================================== @@ -114,6 +114,8 @@ int VSICurlUninstallReadCbk(VSILFILE * /* fp */) constexpr const char *const VSICURL_PREFIXES[] = {"/vsicurl/", "/vsicurl?"}; +extern "C" bool CPL_DLL GDALIsInGlobalDestructorFromDLLMain(); + /***********************************************************รน************/ /* VSICurlAuthParametersChanged() */ /************************************************************************/ @@ -539,7 +541,7 @@ VSICurlHandle::~VSICurlHandle() } if (m_hCurlMultiHandleForAdviseRead) { - curl_multi_cleanup(m_hCurlMultiHandleForAdviseRead); + VSICURLMultiCleanup(m_hCurlMultiHandleForAdviseRead); } if (!m_bCached) @@ -6455,6 +6457,16 @@ void VSICURLDestroyCacheFileProp() void VSICURLMultiCleanup(CURLM *hCurlMultiHandle) { +#if defined(CURL_AT_LEAST_VERSION) && defined(_WIN32) + // Since curl 8.20.0, auxiliary threads are used for DNS resolution + // Trying to join them when detaching the DLL results in a hang. + // See https://github.com/curl/curl/issues/21466#issuecomment-4372138595 +#if CURL_AT_LEAST_VERSION(8, 20, 0) + if (GDALIsInGlobalDestructorFromDLLMain()) + curl_multi_setopt(hCurlMultiHandle, CURLMOPT_QUICK_EXIT, 1L); +#endif +#endif + void *old_handler = CPLHTTPIgnoreSigPipe(); curl_multi_cleanup(hCurlMultiHandle); CPLHTTPRestoreSigPipeHandler(old_handler); View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/-/compare/285c2c49cb0dd7f9e578319f911e1d3b2a52c839...e18d0f85e5a055c15dc117a42827b8dbda9905b7 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/gdal/-/compare/285c2c49cb0dd7f9e578319f911e1d3b2a52c839...e18d0f85e5a055c15dc117a42827b8dbda9905b7 You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
