Commit 36babbe7 authored by Bas Couwenberg's avatar Bas Couwenberg

New upstream version 2.4.0~rc3+dfsg

parent c2eacbb2
*.a
*.la
.libs
*.lo
*.exe
*.dll
*.res
*.marks
*.swp
*.orig
*.gcda
*.gcno
gmon.out
install-sh
postgis_svn_revision.h
aclocal.m4
autom4te.cache/
config.guess
config.log
config.status
config.sub
configure
de9i*.png
doc/html/image_src/generator
doc/html/image_src/Makefile
doc/html/*.html
doc/Makefile
doc/Makefile.comments
doc/po/*/*.xml
doc/po/*/*.po~
doc/po/*/html
doc/po/*/xsl
doc/po/*/*_comments.sql
doc/postgis_aggs_mm.xml
doc/postgis_comments.sql
doc/postgis-out.xml
doc/raster_comments.sql
doc/postgis_gardentest_*.sql
doc/raster_gardentest_*.sql
doc/tiger_geocoder_comments.sql
doc/topology_comments.sql
extensions/Makefile
extensions/address_standardizer/Makefile
extensions/address_standardizer/mk-st-regexp
extensions/address_standardizer/address_standardizer--*.sql
extensions/address_standardizer/address_standardizer.control
extensions/address_standardizer/address_standardizer_data_us.control
extensions/address_standardizer/address_standardizer.sql
extensions/address_standardizer/sql/
extensions/address_standardizer/results/
extensions/address_standardizer/us-*.sql
extensions/postgis/Makefile
extensions/postgis/postgis.control
extensions/postgis/sql/
extensions/postgis/sql_bits/*.sql
extensions/postgis_sfcgal/Makefile
extensions/postgis_sfcgal/postgis_sfcgal.control
extensions/postgis_sfcgal/sql/
extensions/postgis_sfcgal/sql_bits/
extensions/postgis_tiger_geocoder/Makefile
extensions/postgis_tiger_geocoder/postgis_tiger_geocoder.control
extensions/postgis_tiger_geocoder/sql
extensions/postgis_tiger_geocoder/results
extensions/postgis_tiger_geocoder/expected
extensions/postgis_tiger_geocoder/sql_bits/*.sql
extensions/postgis_tiger_geocoder/sql_bits/tiger_geocoder.sql.in
extensions/postgis_tiger_geocoder/sql_bits/tiger_geocoder_minor.sql.in
extensions/postgis_topology/Makefile
extensions/postgis_topology/postgis_topology.control
extensions/postgis_topology/sql/
extensions/postgis_topology/sql_bits/*.sql
GNUmakefile
java/jdbc/Makefile
java/jdbc/lib/
java/jdbc/pom.xml
java/jdbc/target/
liblwgeom/cunit/cu_tester
liblwgeom/cunit/Makefile
liblwgeom/liblwgeom.a
liblwgeom/liblwgeom.h
liblwgeom/Makefile
libtool
loader/cunit/cu_tester
loader/cunit/Makefile
loader/Makefile
loader/pgsql2shp
loader/shp2pgsql
loader/shp2pgsql-gui
ltmain.sh
macros/libtool.m4
macros/lt~obsolete.m4
macros/ltoptions.m4
macros/ltsugar.m4
macros/ltversion.m4
*.o
postgis_config.h
postgis/Makefile
postgis/geobuf.pb-c.c
postgis/geobuf.pb-c.h
postgis/legacy_gist.sql
postgis/legacy_minimal.sql
postgis/legacy.sql
postgis/postgis.sql
postgis/postgis_proc_set_search_path.sql
postgis/postgis_for_extension.sql
postgis/postgis_upgrade_for_extension.sql
postgis/postgis_upgrade_for_extension.sql.in
postgis/postgis_upgrade.sql*
postgis/sfcgal_upgrade.sql*
postgis/sqldefines.h
postgis/uninstall_legacy.sql
postgis/uninstall_postgis.sql
postgis/vector_tile.pb-c.c
postgis/vector_tile.pb-c.h
raster/loader/Makefile
raster/loader/raster2pgsql
raster/Makefile
raster/raster_config.h
raster/rt_core/Makefile
raster/rt_pg/Makefile
raster/rt_pg/rtpostgis.sql
raster/rt_pg/rtpostgis_drop.sql
raster/rt_pg/rtpostgis_legacy.sql
raster/rt_pg/rtpostgis_proc_set_search_path.sql
raster/rt_pg/rtpostgis_upgrade.sql.in
raster/rt_pg/rtpostgis_for_extension.sql
raster/rt_pg/rtpostgis_upgrade_for_extension.sql.in
raster/rt_pg/rtpostgis_upgrade*.sql
raster/rt_pg/uninstall_rtpostgis.sql
raster/scripts/Makefile
raster/scripts/python/Makefile
raster/test/core/Makefile
raster/test/core/testapi
raster/test/core/testwkb
raster/test/cunit/Makefile
raster/test/cunit/cu_tester
raster/test/Makefile
raster/test/regress/Makefile
raster/test/regress/rtpostgis.sql
regress/00-regress-install/
regress/Makefile
regress/postgis.sql
regress/postgis_garden_result.txt
regress/raster_garden_result.txt
*.so
st_*.png
.svn
topology/Makefile
topology/test/Makefile
topology/test/load_topology-4326.sql
topology/test/load_topology.sql
topology/test/topo_predicates.sql
topology/test/regress/topogeo_addlinestring_expected
topology/topology_drop_after.sql
topology/topology_drop_after.sql.in
topology/topology_drop_before.sql
topology/topology_drop_before.sql.in
topology/topology.sql
topology/topology.sql.in
topology/topology_upgrade.sql*
topology/uninstall_topology.sql
libpgcommon/Makefile
libpgcommon/cunit/Makefile
utils/Makefile
utils/postgis_restore.pl
doc/sfcgal_comments.sql
postgis/sfcgal.sql
postgis/uninstall_sfcgal.sql
*.pdf
.idea/*
.syntastic_c_config
This diff is collapsed.
......@@ -39,8 +39,11 @@ check: all docs-check check-no-trailing-blanks
check-no-trailing-blanks:
! find . -name '*.c' -o -name '*.h' | \
grep -vf .gitignore | \
xargs grep -Pn '[\t ]$$'
grep -v lwin_wkt_lex.c | \
grep -v lwin_wkt_parse | \
grep -v vector_tile.pb-c | \
grep -v postgis/sqldefines.h | \
xargs grep -n '[[:space:]]$$'
installcheck:
RUNTESTFLAGS="$(RUNTESTFLAGS) --extension" $(MAKE) check
......
PostGIS 2.4.0rc3
2017/09/27
* Fixes and Enhancements since PostGIS 2.4.0rc2 *
- #3781 st_contains cannot handle curvepolygon / compoundcurve
consisting of only straight lines
- #3866 server crashing from large values in ST_AsTWKB
- #3818 Allow triangles unclosed in M to be WKT parsed
- several packaging changes regarding checking trailing blanks
See PostGIS 2.4.0 section for details of
new features and enhancements in this release.
PostGIS 2.4.0rc2
2017/09/24
* Fixes and Enhancements since PostGIS 2.4.0rc1 *
......@@ -27,7 +40,7 @@ Note possible breaking changes since 2.4.0 beta1 release are:
See PostGIS 2.4.0 section for details of new features and fixes in this release
PostGIS 2.4.0
2017/09/xx
2017/09/29
* New Features *
- #3822, Have postgis_full_version() also show and check version of
......
Debbie:
[![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_trunk)](https://debbie.postgis.net/view/PostGIS/job/PostGIS_trunk/)
[![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_2.4)](https://debbie.postgis.net/view/PostGIS/job/PostGIS_2.4/)
Winnie:
[![Build Status](https://debbie.postgis.net:444/buildStatus/icon?job=PostGIS_trunk)](https://debbie.postgis.net:444/view/PostGIS/job/PostGIS_trunk/)
[![Build Status](https://debbie.postgis.net:444/buildStatus/icon?job=PostGIS_2.4)](https://debbie.postgis.net:444/view/PostGIS/job/PostGIS_2.4/)
Dronie:
[![Build Status](https://drone.osgeo.org/api/badges/postgis/postgis/status.svg?branch=svn-trunk)](https://drone.osgeo.org/postgis/postgis?branch=svn-trunk)
[![Build Status](https://drone.osgeo.org/api/badges/postgis/postgis/status.svg?branch=svn-2.4)](https://drone.osgeo.org/postgis/postgis?branch=svn-2.4)
Travis:
[![Build Status](https://secure.travis-ci.org/postgis/postgis.svg)](http://travis-ci.org/postgis/postgis)
GitLab-CI:
[![Gitlab-CI](https://gitlab.com/postgis/postgis/badges/svn-trunk/build.svg)](https://gitlab.com/postgis/postgis/commits/svn-trunk)
[![Gitlab-CI](https://gitlab.com/postgis/postgis/badges/svn-2.4/build.svg)](https://gitlab.com/postgis/postgis/commits/svn-2.4)
This file is here to play nicely with modern code repository facilities.
Actual readme is [here](README.postgis).
......
PostGIS - Geographic Information Systems Extensions to PostgreSQL
=================================================================
:Version: 2.4.0rc2
:Date: 2017-09-24
:Version: 2.4.0rc3
:Date: 2017-09-25
:Website: http://postgis.net
This distribution contains a module which implements GIS simple features, ties
......
......@@ -5,7 +5,7 @@
POSTGIS_MAJOR_VERSION=2
POSTGIS_MINOR_VERSION=4
POSTGIS_MICRO_VERSION=0rc2
POSTGIS_MICRO_VERSION=0rc3
# Liblwgeom interface versioning, reset to 0:0:0 (cur:age:rev)
# when changing POSTGIS_MINOR_VERSION
......
......@@ -5,7 +5,7 @@
<sect1>
<title>Release 2.4.0</title>
<para>Release date: 2017/09/xx</para>
<para>Release date: 2017/09/29</para>
<simplesect><title>New Features</title>
<para>#3822, Have postgis_full_version() also show and check version of
PostgreSQL the scripts were built against (Sandro Santilli)</para>
......
......@@ -30,14 +30,14 @@ POSTGIS_PGSQL_VERSION=96
SQLPP = /usr/bin/cpp -traditional-cpp -w -P
GREP=/bin/grep
PERL=/usr/bin/perl
EXTVERSION = 2.4.0rc2
EXTVERSION = 2.4.0rc3
MINORVERSION = 2.4
MODULE_big = address_standardizer-2.4
EXTENSION = address_standardizer
DATA = address_standardizer_data_us.control sql/$(EXTENSION).sql sql/$(EXTENSION)_data_us.sql
all: sql/address_standardizer.sql sql/address_standardizer--1.0--$(EXTVERSION).sql sql/address_standardizer--$(EXTVERSION).sql sql/address_standardizer--$(EXTVERSION)--$(EXTVERSION)next.sql sql/address_standardizer--$(EXTVERSION)next--$(EXTVERSION).sql \
sql/$(EXTENSION)_data_us.sql sql/address_standardizer--2.4.0rc2.sql sql/$(EXTENSION)_data_us--2.4.0rc2.sql sql/$(EXTENSION)_data_us--$(EXTVERSION)--$(EXTVERSION)next.sql \
sql/$(EXTENSION)_data_us.sql sql/address_standardizer--2.4.0rc3.sql sql/$(EXTENSION)_data_us--2.4.0rc3.sql sql/$(EXTENSION)_data_us--$(EXTVERSION)--$(EXTVERSION)next.sql \
sql/$(EXTENSION)_data_us--$(EXTVERSION)next--$(EXTVERSION).sql \
sql/test-init-extensions.sql sql/test-parseaddress.sql sql/test-standardize_address_1.sql sql/test-standardize_address_2.sql
......@@ -68,7 +68,7 @@ sql/%.sql: %.sql.in
$(SQLPP) -I../libpgcommon $< | grep -v '^#' | \
$(PERL) -lpe "s'MODULE_PATHNAME'\$$libdir/${EXTENSION}-${MINORVERSION}'g" > $@
sql/address_standardizer--2.4.0rc2.sql: sql/address_standardizer_types.sql \
sql/address_standardizer--2.4.0rc3.sql: sql/address_standardizer_types.sql \
sql/address_standardizer_functions.sql
cat $^ > $@
......
# address_standardizer extension
comment = 'Used to parse an address into constituent elements. Generally used to support geocoding address normalization step.'
default_version = '2.4.0rc2'
default_version = '2.4.0rc3'
relocatable = true
# address standardizer us dataset
comment = 'Address Standardizer US dataset example'
default_version = '2.4.0rc2'
default_version = '2.4.0rc3'
relocatable = true
include ../upgradeable_versions.mk
EXTENSION = postgis
EXTVERSION = 2.4.0rc2
EXTVERSION = 2.4.0rc3
MINORVERSION = 2.4
GREP = /bin/grep
PERL = /usr/bin/perl
......
# postgis extension
comment = 'PostGIS geometry, geography, and raster spatial types and functions'
default_version = '2.4.0rc2'
default_version = '2.4.0rc3'
module_pathname = '$libdir/postgis-2.4'
relocatable = false
include ../upgradeable_versions.mk
EXTENSION = postgis_sfcgal
EXTVERSION = 2.4.0rc2
EXTVERSION = 2.4.0rc3
MINORVERSION = 2.4
GREP = /bin/grep
PERL = /usr/bin/perl
......
# postgis topology extension
comment = 'PostGIS SFCGAL functions'
default_version = '2.4.0rc2'
default_version = '2.4.0rc3'
relocatable = true
requires = postgis
include ../upgradeable_versions.mk
EXTENSION = postgis_tiger_geocoder
EXTVERSION = 2.4.0rc2
EXTVERSION = 2.4.0rc3
MINORVERSION = 2011.2.4
GREP = /bin/grep
PERL = /usr/bin/perl
......
# postgis tiger geocoder extension
comment = 'PostGIS tiger geocoder and reverse geocoder'
default_version = '2.4.0rc2'
default_version = '2.4.0rc3'
relocatable = false
schema = tiger
requires = 'postgis,fuzzystrmatch'
include ../upgradeable_versions.mk
EXTENSION = postgis_topology
EXTVERSION = 2.4.0rc2
EXTVERSION = 2.4.0rc3
MINORVERSION = 2.4
GREP = /bin/grep
PERL = /usr/bin/perl
......
# postgis topology extension
comment = 'PostGIS topology spatial types and functions'
default_version = '2.4.0rc2'
default_version = '2.4.0rc3'
relocatable = false
schema = topology
requires = postgis
......@@ -29,4 +29,6 @@ UPGRADEABLE_VERSIONS = \
2.3.3 \
2.4.0alpha \
2.4.0beta1 \
2.4.0rc1
2.4.0rc1 \
2.4.0rc2 \
2.4.0dev
......@@ -239,7 +239,7 @@ void
bytebuffer_append_varint(bytebuffer_t *b, const int64_t val)
{
size_t size;
bytebuffer_makeroom(b, 8);
bytebuffer_makeroom(b, 16);
size = varint_s64_encode_buf(val, b->writecursor);
b->writecursor += size;
return;
......@@ -252,7 +252,7 @@ void
bytebuffer_append_uvarint(bytebuffer_t *b, const uint64_t val)
{
size_t size;
bytebuffer_makeroom(b, 8);
bytebuffer_makeroom(b, 16);
size = varint_u64_encode_buf(val, b->writecursor);
b->writecursor += size;
return;
......
......@@ -198,6 +198,9 @@ static void do_test_s64_roundtrip(int64_t i64_in)
static void test_varint_roundtrip(void)
{
do_test_u64_roundtrip(0xFFFFFFFFFFFFFFFF);
int i;
for ( i = 0; i < 1024; i += 63 )
{
......
......@@ -576,12 +576,6 @@ static LWTRIANGLE* lwtriangle_from_wkb_state(wkb_parse_state *s)
return NULL;
}
if( s->check & LW_PARSER_CHECK_CLOSURE && ! ptarray_is_closed(pa) )
{
lwerror("%s must have closed rings", lwtype_name(s->lwtype));
return NULL;
}
if( s->check & LW_PARSER_CHECK_ZCLOSURE && ! ptarray_is_closed_z(pa) )
{
lwerror("%s must have closed rings", lwtype_name(s->lwtype));
......
......@@ -447,7 +447,7 @@ LWGEOM* wkt_parser_triangle_new(POINTARRAY *pa, char *dimensionality)
}
/* Triangles need closure. */
if( ! ptarray_is_closed(pa) )
if( ! ptarray_is_closed_z(pa) )
{
ptarray_free(pa);
SET_PARSER_ERROR(PARSER_ERROR_UNCLOSED);
......
......@@ -71,6 +71,8 @@ lwgeom_has_arc(const LWGEOM *geom)
case TINTYPE:
return LW_FALSE;
case CIRCSTRINGTYPE:
case CURVEPOLYTYPE:
case COMPOUNDTYPE:
return LW_TRUE;
/* It's a collection that MAY contain an arc */
default:
......
......@@ -140,7 +140,7 @@ main(int argc, char **argv)
/* Schema qualified table name */
char *strptr = argv[pgis_optind];
char *chrptr = strchr(strptr, '.');
/* OK, this is a schema-qualified table name... */
if (chrptr)
{
......@@ -217,7 +217,7 @@ main(int argc, char **argv)
{
fprintf(stderr, "%s\n", state->message);
fflush(stderr);
if (ret == SHPDUMPERERR)
exit(1);
}
......
......@@ -9,7 +9,7 @@
#define POSTGIS_PGSQL_VERSION 96
#define POSTGIS_GEOS_VERSION 37
#define POSTGIS_PROJ_VERSION 49
#define POSTGIS_LIB_VERSION '2.4.0rc2'
#define POSTGIS_LIB_VERSION '2.4.0rc3'
#define POSTGIS_LIBXML2_VERSION 2.9.4
#define POSTGIS_SFCGAL_VERSION 13
......@@ -25,13 +25,13 @@
* won't substitute within apostrophes)
*/
#define _POSTGIS_SQL_SELECT_POSTGIS_VERSION 'SELECT ''2.4 USE_GEOS=1 USE_PROJ=1 USE_STATS=1''::text AS version'
#define _POSTGIS_SQL_SELECT_POSTGIS_BUILD_DATE 'SELECT ''2017-09-24 08:34:13''::text AS version'
#define _POSTGIS_SQL_SELECT_POSTGIS_BUILD_DATE 'SELECT ''2017-09-27 06:31:04''::text AS version'
#define _POSTGIS_SQL_SELECT_POSTGIS_PGSQL_VERSION 'SELECT ''96''::text AS version'
#if POSTGIS_SVN_REVISION
#define _POSTGIS_SQL_SELECT_POSTGIS_SCRIPTS_VERSION $$ SELECT '2.4.0rc2'::text || ' r' || POSTGIS_SVN_REVISION::text AS version $$
#define _POSTGIS_SQL_SELECT_POSTGIS_SCRIPTS_VERSION $$ SELECT '2.4.0rc3'::text || ' r' || POSTGIS_SVN_REVISION::text AS version $$
#else
#define _POSTGIS_SQL_SELECT_POSTGIS_SCRIPTS_VERSION $$ SELECT '2.4.0rc2'::text AS version $$
#define _POSTGIS_SQL_SELECT_POSTGIS_SCRIPTS_VERSION $$ SELECT '2.4.0rc3'::text AS version $$
#endif
#define SRID_USR_MAX 998999
......
......@@ -3,7 +3,7 @@
#include "postgis_svn_revision.h"
/* Manually manipulate the POSTGIS_DEBUG_LEVEL, it is not affected by the
/* Manually manipulate the POSTGIS_DEBUG_LEVEL, it is not affected by the
configure process */
#define POSTGIS_DEBUG_LEVEL 0
......
#define POSTGIS_SVN_REVISION 15810
#define POSTGIS_SVN_REVISION 15847
*.log
aclocal.m4
autom4te.cache
configure
config.status
ID
libtool
ltmain.sh
tags
raster_config.h
Makefile
*.log
*.sql
Makefile
raster2pgsql
......@@ -1229,7 +1229,7 @@ add_raster_constraints(
(regular_blocking ? "TRUE" : "FALSE"),
(max_extent ? "TRUE" : "FALSE")
);
if (_schema != NULL)
rtdealloc(_schema);
rtdealloc(_table);
......@@ -1330,7 +1330,7 @@ add_overview_constraints(
_column,
factor
);
if (_ovschema != NULL)
rtdealloc(_ovschema);
rtdealloc(_ovtable);
......@@ -2281,7 +2281,7 @@ main(int argc, char **argv) {
char *tmp = NULL;
rt_init_allocators();
#ifdef USE_NLS
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
......
libtool.m4
lt~obsolete.m4
ltsugar.m4
ltoptions.m4
ltversion.m4
Makefile
rtpostgis.sql
rtpostgis_drop.sql
rtpostgis_upgrade*.sql
uninstall_rtpostgis.sql
rtpostgis_legacy.sql
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment