[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#858638: unblock: postgis-2.3.1+dfsg-2



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-CC: Sebastiaan Couwenberg <sebastic@xs4all.nl>

Dear release team,

please unblock package postgis, it kind of FTBFS [0]:

When rebuilding on current stretch, the SQL scripts generated start with
an escape character, rather than a backslash. This in turn prevents the
postgis extension from being newly created for a database (existing
instances would still work).

This is due to a bashism in the Makefiles generating the SQL scripts
during the build. The additional patch avoid-bashisms.patch fixes that.

Kind Regards

Markus Wanner


[0]: Debian Issue:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=858610

[1]: Original PgApt Issue:
https://redmine.postgresql.org/issues/2279
diff -Nru postgis-2.3.1+dfsg/debian/changelog postgis-2.3.1+dfsg/debian/changelog
--- postgis-2.3.1+dfsg/debian/changelog	2016-11-29 00:32:50.000000000 +0100
+++ postgis-2.3.1+dfsg/debian/changelog	2017-03-24 19:35:00.000000000 +0100
@@ -1,3 +1,10 @@
+postgis (2.3.1+dfsg-2) unstable; urgency=medium
+
+  * Add patch avoid-bashisms.patch to fix the generated sql files.
+    Closes: #858610.
+
+ -- Markus Wanner <markus@bluegap.ch>  Fri, 24 Mar 2017 19:35:00 +0100
+
 postgis (2.3.1+dfsg-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru postgis-2.3.1+dfsg/debian/patches/avoid-bashisms.patch postgis-2.3.1+dfsg/debian/patches/avoid-bashisms.patch
--- postgis-2.3.1+dfsg/debian/patches/avoid-bashisms.patch	1970-01-01 01:00:00.000000000 +0100
+++ postgis-2.3.1+dfsg/debian/patches/avoid-bashisms.patch	2017-03-24 19:35:00.000000000 +0100
@@ -0,0 +1,37 @@
+Description: Avoid a few bashisms resulting in invalid SQL files
+ An echo that's supposed to output a backslash works with bash, but not
+ in dash. Use printf, instead.
+Author: Markus Wanner <markus@bluegap.ch>
+Forwarded: yes, https://lists.osgeo.org/pipermail/postgis-devel/2017-March/026135.html
+
+--- a/extensions/postgis/Makefile.in
++++ b/extensions/postgis/Makefile.in
+@@ -39,7 +39,7 @@
+ 
+ sql/$(EXTENSION).sql: sql_bits/postgis.sql sql_bits/postgis_comments.sql sql_bits/rtpostgis.sql sql_bits/spatial_ref_sys_config_dump.sql sql_bits/raster_comments.sql sql_bits/spatial_ref_sys.sql
+ 	mkdir -p sql
+-	echo '\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \quit' > $@
++	printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
+ 	cat $^ >> $@
+ 
+ sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
+@@ -94,7 +94,7 @@
+ 
+ #postgis_extension_upgrade_minor.sql is the one that contains both postgis AND raster
+ sql_bits/postgis_extension_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/postgis_upgrade.sql sql_bits/rtpostgis_upgrade.sql ../../doc/raster_comments.sql ../../doc/postgis_comments.sql ../postgis_extension_helper_uninstall.sql
+-	echo '\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \quit' > $@
++	printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
+ 	cat $^ >> $@
+ 
+ sql_minor_upgrade: sql_bits/postgis_extension_upgrade_minor.sql
+--- a/extensions/postgis_sfcgal/Makefile.in
++++ b/extensions/postgis_sfcgal/Makefile.in
+@@ -74,7 +74,7 @@
+ 
+ sql_bits/sfcgal_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/sfcgal_upgrade.sql ../../doc/sfcgal_comments.sql ../postgis_extension_helper_uninstall.sql
+ 	mkdir -p sql_bits
+-	echo '\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \quit' > $@
++	printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
+ 	cat $^ >> $@
+ 
+ sql_minor_upgrade: sql_bits/sfcgal_upgrade_minor.sql
diff -Nru postgis-2.3.1+dfsg/debian/patches/series postgis-2.3.1+dfsg/debian/patches/series
--- postgis-2.3.1+dfsg/debian/patches/series	2016-10-21 11:41:00.000000000 +0200
+++ postgis-2.3.1+dfsg/debian/patches/series	2017-03-24 19:35:00.000000000 +0100
@@ -1,2 +1,3 @@
+avoid-bashisms.patch
 link-liblwgeom
 relax-test-timing-constraints.patch

Attachment: signature.asc
Description: OpenPGP digital signature


Reply to: