debian/changelog

+postgis (2.4.4+dfsg-5) UNRELEASED; urgency=medium
+
+  * Re-enable SFCGAL support, FTBFS with CGAL 4.12 is fixed.
+  * Disable PIE only on older Ubuntu releases.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 06 Apr 2018 16:39:56 +0200
+
 postgis (2.4.4+dfsg-4) unstable; urgency=medium
 
   * Add patches to fix parallel build of other extensions.

debian/control

@@ -24,8 +24,9 @@ Build-Depends: autoconf2.13,
                libjson-c-dev | libjson0-dev (>= 0.9~),
                libproj-dev (>= 4.6.0),
                libprotobuf-c-dev,
-#               libsfcgal-dev [!armel],
+               libsfcgal-dev [!armel],
                libxml2-dev (>= 2.5.0~),
+               lsb-release,
                po-debconf,
                postgresql-all,
                postgresql-common (>= 148~),

debian/control.in

@@ -24,8 +24,9 @@ Build-Depends: autoconf2.13,
                libjson-c-dev | libjson0-dev (>= 0.9~),
                libproj-dev (>= 4.6.0),
                libprotobuf-c-dev,
-#               libsfcgal-dev [!armel],
+               libsfcgal-dev [!armel],
                libxml2-dev (>= 2.5.0~),
+               lsb-release,
                po-debconf,
                postgresql-all,
                postgresql-common (>= 148~),

debian/liblwgeom-2.4-0.symbols

@@ -2,11 +2,11 @@ liblwgeom-2.4.so.0 #PACKAGE# #MINVER#
  GBOX2GEOS@Base 2.2.0
  GEOS2LWGEOM@Base 2.0.0
  LWGEOM2GEOS@Base 2.0.0
-# (arch=!armel)LWGEOM2SFCGAL@Base 2.2.0
+ (arch=!armel)LWGEOM2SFCGAL@Base 2.2.0
  LWGEOM_GEOS_buildArea@Base 2.0.0
  LWGEOM_GEOS_getPointN@Base 2.0.0
  MULTITYPE@Base 2.1.5
-# (arch=!armel)SFCGAL2LWGEOM@Base 2.2.0
+ (arch=!armel)SFCGAL2LWGEOM@Base 2.2.0
  UF_create@Base 2.2.0
  UF_destroy@Base 2.2.0
  UF_find@Base 2.2.0
@@ -437,8 +437,8 @@ liblwgeom-2.4.so.0 #PACKAGE# #MINVER#
  lwgeom_set_geodetic@Base 2.0.0
  lwgeom_set_handlers@Base 2.1.0
  lwgeom_set_srid@Base 2.0.0
-# (arch=!armel)lwgeom_sfcgal_noop@Base 2.2.0
-# (arch=!armel)lwgeom_sfcgal_version@Base 2.2.0
+ (arch=!armel)lwgeom_sfcgal_noop@Base 2.2.0
+ (arch=!armel)lwgeom_sfcgal_version@Base 2.2.0
  lwgeom_sharedpaths@Base 2.0.0
  lwgeom_simplify@Base 2.0.0
  lwgeom_snap@Base 2.0.0

debian/rules

@@ -12,10 +12,13 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 # Disable PIE on Ubuntu where it's still problematic
 VENDOR_DERIVES_FROM_UBUNTU ?= $(shell dpkg-vendor --derives-from Ubuntu && echo yes)
+DISTRIBUTION_RELEASE       := $(shell lsb_release -cs)
 
 ifeq ($(VENDOR_DERIVES_FROM_UBUNTU),yes)
+  ifneq (,$(filter $(DISTRIBUTION_RELEASE),trusty xenial artful bionic))
     export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
   endif
+endif
 
 include /usr/share/dpkg/pkg-info.mk
 

debian/tests/test-extension-creation

@@ -5,7 +5,7 @@ set -eu
 for v in $(pg_buildext supported-versions); do
 	pg_virtualenv -v $v sh -e <<-'EOF'
 	# test extension
-	for ext in postgis fuzzystrmatch postgis_tiger_geocoder postgis_topology address_standardizer address_standardizer_data_us; do
+	for ext in postgis postgis_sfcgal fuzzystrmatch postgis_tiger_geocoder postgis_topology address_standardizer address_standardizer_data_us; do
 		psql -eXc "CREATE EXTENSION $ext"
 	done
 	EOF