This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, stable-3.2 has been updated
via 15c7d6378e5de6629a392495ac226513bdfd8752 (commit)
via de31a859edbd348d3ffa7627ea7011c2352738d8 (commit)
from 184fc31b65e84cffba35bf54bcb9e0cc265ff0cd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 15c7d6378e5de6629a392495ac226513bdfd8752
Merge: 184fc31b6 de31a859e
Author: Darafei Praliaskouski <komzpa at gmail.com>
Date: Fri Jul 24 03:10:53 2026 -0700
Merge pull request 'Fix PostgreSQL 19 SFCGAL builds on stable 3.2' (!499) from Komzpa/postgis:fix/sfcgal-pqsignal-stable32-20260724 into stable-3.2
Reviewed-on: https://gitea.osgeo.org/postgis/postgis/pulls/499
commit de31a859edbd348d3ffa7627ea7011c2352738d8
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Fri Jul 24 12:44:55 2026 +0400
Fix PostgreSQL 19 SFCGAL builds
Backpatch the SFCGAL part of 0b003a82991bf05022ab1b924b5f8e1e407cd043 to avoid relying on pqsignal() returning the previous handler. New PostgreSQL headers expose pqsignal() as void, which breaks Worker_Run builds on older stable branches.
References https://trac.osgeo.org/postgis/ticket/5841
diff --git a/NEWS b/NEWS
index 083a5d913..6c6396e6d 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,7 @@ PostGIS 3.2.11
GDAL compatibility (Darafei Praliaskouski)
- GH-895, Qualify pg_class lookup during SRID/PROJ validation
(Darafei Praliaskouski)
+ - Fix PostgreSQL 19 SFCGAL builds (Paul Ramsey)
- GH-897, [topology] Harden topology helper functions and
maintenance SQL against identifier, tolerance, bigint, and cleanup
regressions (Darafei Praliaskouski)
diff --git a/sfcgal/lwgeom_sfcgal.c b/sfcgal/lwgeom_sfcgal.c
index 3e3729bc5..995b89ccd 100644
--- a/sfcgal/lwgeom_sfcgal.c
+++ b/sfcgal/lwgeom_sfcgal.c
@@ -31,22 +31,12 @@
#include "utils/elog.h"
#include "utils/guc.h"
-#include "libpq/pqsignal.h"
#include "../liblwgeom/liblwgeom.h"
/*
* This is required for builds against pgsql
*/
PG_MODULE_MAGIC;
-#ifdef WIN32
-static void interruptCallback() {
- if (UNBLOCKED_SIGNAL_QUEUE())
- pgwin32_dispatch_queued_signals();
-}
-#endif
-
-static pqsigfunc coreIntHandler = 0;
-static void handleInterrupt(int sig);
/*
* Module load callback
@@ -55,16 +45,8 @@ void _PG_init(void);
void
_PG_init(void)
{
-
- coreIntHandler = pqsignal(SIGINT, handleInterrupt);
-
-#ifdef WIN32
- GEOS_interruptRegisterCallback(interruptCallback);
- lwgeom_register_interrupt_callback(interruptCallback);
-#endif
-
- /* install PostgreSQL handlers */
- pg_install_lwgeom_handlers();
+ /* install PostgreSQL handlers */
+ pg_install_lwgeom_handlers();
}
/*
@@ -74,27 +56,7 @@ void _PG_fini(void);
void
_PG_fini(void)
{
- elog(NOTICE, "Goodbye from PostGIS SFCGAL %s", POSTGIS_VERSION);
- pqsignal(SIGINT, coreIntHandler);
-}
-
-
-static void
-handleInterrupt(int sig)
-{
- /* NOTE: printf here would be dangerous, see
- * https://trac.osgeo.org/postgis/ticket/3644
- *
- * TODO: block interrupts during execution, to fix the problem
- */
- /* printf("Interrupt requested\n"); fflush(stdout); */
-
- /* request interruption of liblwgeom as well */
- lwgeom_request_interrupt();
-
- if ( coreIntHandler ) {
- (*coreIntHandler)(sig);
- }
+ elog(NOTICE, "Goodbye from PostGIS SFCGAL %s", POSTGIS_VERSION);
}
Datum postgis_sfcgal_version(PG_FUNCTION_ARGS);
-----------------------------------------------------------------------
Summary of changes:
NEWS | 1 +
sfcgal/lwgeom_sfcgal.c | 44 +++-----------------------------------------
2 files changed, 4 insertions(+), 41 deletions(-)
hooks/post-receive
--
PostGIS