.drone.yml

 # See http://readme.drone.io/0.5/usage/overview
 
-# See https://git.osgeo.org/gitea/postgis/postgis-docker
+# See https://git.osgeo.org/gogs/postgis/postgis-docker
 test-image: &test-image docker.kbt.io/postgis/build-test:trisquel2
 
 matrix:
   PGVER:
-    - 9.3
     - 9.4
     - 9.5
     - 9.6
@@ -25,7 +24,7 @@ pipeline:
       - export PATH=/usr/lib/postgresql/$PGVER/bin:$PATH
       - psql --version
       - ./autogen.sh
-      - ./configure CFLAGS="-O0 -Wall -fno-omit-frame-pointer" --without-interrupt-tests
+      - ./configure CFLAGS="-O0 -Wall -fno-omit-frame-pointer -Werror" --without-interrupt-tests
       - make
       # we should maybe wait for postgresql service to startup here...
       - psql -c "select version()" template1

.editorconfig

@@ -18,7 +18,7 @@ trim_trailing_whitespace = false
 indent_style = tab
 
 # Perl files want tab indentation
-[*.{pl}]
+[*.pl]
 indent_style = tab
 
 # SQL files want tab indentation
@@ -34,9 +34,6 @@ indent_size = 2
 [liblwgeom/lwgeom_topo.{c,h}]
 indent_style = space
 
-[liblwgeom/box2d.c]
-indent_style = space
-
 [liblwgeom/lwgeom_log.h]
 indent_style = space
 

.github/codecov.yml

+coverage:
+    status:
+        project:
+            default:
+                threshold: 0.2%
+        patch:
+            default:
+                threshold: 0.2%
+comment: false

.github/stale.yml

+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.gitignore

@@ -14,7 +14,10 @@ gmon.out
 postgis_svn_revision.h
 aclocal.m4
 autom4te.cache/
+build-aux/
 config.log
+config.guess
+config.sub
 config.status
 configure
 de9i*.png
@@ -67,12 +70,15 @@ extensions/postgis_topology/postgis_topology.control
 extensions/postgis_topology/sql/
 extensions/postgis_topology/sql_bits/*.sql
 GNUmakefile
+install-sh
 java/jdbc/Makefile
 java/jdbc/lib/
 java/jdbc/pom.xml
 java/jdbc/target/
 liblwgeom/cunit/cu_tester
 liblwgeom/cunit/Makefile
+liblwgeom/geobuf.pb-c.c
+liblwgeom/geobuf.pb-c.h
 liblwgeom/liblwgeom.a
 liblwgeom/liblwgeom.h
 liblwgeom/Makefile
@@ -84,7 +90,6 @@ loader/pgsql2shp
 loader/shp2pgsql
 loader/shp2pgsql-gui
 ltmain.sh
-build-aux/
 macros/libtool.m4
 macros/lt~obsolete.m4
 macros/ltoptions.m4
@@ -167,3 +172,7 @@ postgis/uninstall_sfcgal.sql
 *.pdf
 .idea/*
 .syntastic_c_config
+
+# LLVM JIT
+*.bc
+*.ll

.gitlab-ci.yml

@@ -10,7 +10,7 @@ test:
     - service postgresql start
     - su -l postgres -c "createuser -s `whoami`"
     - ./autogen.sh
-    - ./configure
+    - ./configure CFLAGS="-Wall -fno-omit-frame-pointer -Werror"
     - make
     - make check RUNTESTFLAGS=-v
     - make check RUNTESTFLAGS="-v --dumprestore"

.travis.yml

 env:
-  global:
-    - RUNTESTFLAGS=-v
+  matrix:
+    - CFLAGS="-g -Og" MATRIX_EVAL="touch check-no-trailing-blanks"
+    - CFLAGS="-g -O2 -fstack-protector -Wformat -Werror=format-security" LDFLAGS="-Wl,-Bsymbolic-functions -Wl,-z,relro"
+    - CFLAGS="-g -O3 -mtune=generic -fno-omit-frame-pointer -Werror -Wall -Wextra -Wno-unused-parameter"
+    - CFLAGS="-g -O0 --coverage -fprofile-arcs -ftest-coverage" LDFLAGS="--coverage -fprofile-arcs -ftest-coverage" CONFIGURE_FLAGS="--enable-debug"
 
 addons:
   postgresql: "9.6"
+  apt:
+    packages:
+      - eatmydata
 
 before_install:
+  - eval "${MATRIX_EVAL}"
+  - sudo sh -c "echo /usr/lib/libeatmydata/libeatmydata.so >> /etc/ld.so.preload"
+  - curl -sSfL https://github.com/mapbox/logbt/archive/v2.0.3.tar.gz | sudo tar --gunzip --extract --strip-components=1 --exclude="*md" --exclude="test*" --directory=/usr/local
+  - curl -sSfL https://raw.githubusercontent.com/mapbox/logbt/30c554dd37b6c96c23fc424f75910fc6d6696f00/bin/logbt | sudo tee /usr/local/bin/logbt > /dev/null
+  - sudo logbt --setup
+  - sudo service postgresql stop 9.6
+  - sudo chown -hRL --from=postgres travis:travis /etc /var /tmp
+  - sudo usermod -u 1000 postgres
+  - sudo adduser travis ssl-cert
+  - sudo service postgresql start 9.6
   - sudo add-apt-repository --yes ppa:ubuntugis/ppa
   - sudo add-apt-repository --yes ppa:ubuntugis/ubuntugis-unstable
   - sudo apt-get update -qq
-  - sudo apt-get install -y --no-install-recommends
-      postgresql-9.6 postgresql-server-dev-9.6
-      libcunit1-dev xsltproc docbook-xsl docbook-mathml dblatex
-      libproj-dev libgdal-dev libgeos-dev libjson0-dev
-      libsfcgal1 libsfcgal-dev libprotobuf-c0-dev libgdal-dev 
-  - dpkg -l | grep postgresql
+  - mkdir -p /home/travis/deb && touch /home/travis/deb/__ && sudo cp -n /home/travis/deb/* /var/cache/apt/archives || true
+  - sudo apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests libsfcgal1 libsfcgal-dev postgresql-server-dev-9.6 libxml2-utils libcunit1-dev xsltproc docbook-xsl docbook-mathml dblatex libgeos-dev libjson0-dev libgdal-dev gdb libc6-dbg
+  - sudo sh -c "echo deb http://archive.ubuntu.com/ubuntu/ artful main restricted universe multiverse >> /etc/apt/sources.list"
+  - sudo apt-get update -qq
+  - sudo apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests binutils libproj-dev libprotobuf-c-dev protobuf-c-compiler
+  - cp -n /var/cache/apt/archives/* /home/travis/deb || true
+  - ls -la /home/travis/deb/
+  - sudo ldconfig
   - ./autogen.sh
 
+after_failure:
+  - sudo head -n1000 /var/log/postgresql/postgresql-9.6-main.log
+
+after_success:
+  - bash .github/codecov.bash
+
 language: c
 
 compiler: gcc
 
 dist: trusty
 
+cache:
+  ccache: true
+  directories:
+    - /home/travis/deb
+
 script:
-  - ./configure
-  - make
+  - ./configure CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" $CONFIGURE_FLAGS || cat config.log
+  - make -j
   - chmod 755 /home/travis
-  - make check
-  - make check RUNTESTFLAGS='--dumprestore'
+  - logbt -- make check "RUNTESTFLAGS=--verbose"
+  - logbt -- make check "RUNTESTFLAGS='--dumprestore --verbose'"
   - sudo make install
-  - make installcheck
-  - make installcheck RUNTESTFLAGS='--dumprestore'
+  - logbt -- make installcheck "RUNTESTFLAGS=--verbose"
+  - logbt -- make installcheck "RUNTESTFLAGS=--dumprestore --verbose"
 
 notifications:
   email: false

CONTRIBUTING.md

-PostGIS development planning happens via a [Trac instance]
-(https://trac.osgeo.org/postgis/).
+PostGIS development planning happens via a [Trac instance](https://trac.osgeo.org/postgis/).
 
 In order for proper scheduling of contributions acceptance/merging it
 is recommended to file a ticket there and add your patch or a link
 to a patch or to a public git branch where your development is ongoing.
 
 Filing a ticket requires setting up an OSGeo account, which lets you
-contribute to every project of the [Open Source Geospatial Foundation]
-(http://www.osgeo.org/).
+contribute to every project of the [Open Source Geospatial Foundation](http://www.osgeo.org/).
 
 As we understand you might not want to setup a new account, simply
-filing a pull request on one of the [PostGIS code mirrors]
-(https://trac.osgeo.org/postgis/wiki/CodeMirrors) is also welcome,
+filing a pull request on one of the [PostGIS code mirrors](https://trac.osgeo.org/postgis/wiki/CodeMirrors) is also welcome,
 but it is easier for such contributions to miss our radars unless
 it _also_ has a matching Trac ticket.
 
 If you intend to be involved for more than an occasional patch we
-recommend you to subscribe to the [development mailing list]
-(https://lists.osgeo.org/mailman/listinfo/postgis-devel).
+recommend you to subscribe to the [development mailing list](https://lists.osgeo.org/mailman/listinfo/postgis-devel).

GNUmakefile.in

@@ -38,7 +38,7 @@ test: check
 check: all docs-check check-no-trailing-blanks
 
 check-no-trailing-blanks:
-	! find . -name '*.c' -o -name '*.h' | \
+	! find . -name '*.c' -o -name '*.h' -o -name '*.proto' | \
 		grep -v lwin_wkt_lex.c | \
 		grep -v lwin_wkt_parse | \
 		grep -v vector_tile.pb-c | \
@@ -137,11 +137,12 @@ raster-post-install-check:
 raster-sql:
 	$(MAKE) -C raster rtpostgis.sql
 
-astyle:
+.PHONY: fmt
+fmt:
 	./astyle.sh
 
 commit:
-	$(MAKE) astyle && $(MAKE) clean && $(MAKE) check && svn commit
+	$(MAKE) fmt && $(MAKE) clean && $(MAKE) check && svn commit
 
 authors.git: authors.svn
 	sed -e 's/:/ = /' authors.svn > authors.git

NEWS

+PostGIS 2.5.0
+2018/09/23
+WARNING: If compiling with PostgreSQL+JIT, LLVM >= 6 is required
+Supported PostgreSQL versions for this release are:
+PostgreSQL 9.4 - PostgreSQL 12 (in development)
+GEOS >= 3.5
+
+* New Features *
+  - #1847, spgist 2d and 3d support for PG 11+
+    (Esteban Zimányi and Arthur Lesuisse from Université Libre de Bruxelles (ULB),
+      Darafei Praliaskouski)
+  - #4056, ST_FilterByM (Nicklas Avén)
+  - #4050, ST_ChaikinSmoothing (Nicklas Avén)
+  - #3989, ST_Buffer single sided option (Stephen Knox)
+  - #3876, ST_Angle function (Rémi Cura)
+  - #3564, ST_LineInterpolatePoints (Dan Baston)
+  - #3896, PostGIS_Extensions_Upgrade() (Regina Obe)
+  - #3913, Upgrade when creating extension from unpackaged (Sandro Santilli)
+  - #2256, _postgis_index_extent() for extent from index (Paul Ramsey)
+  - #3176, Add ST_OrientedEnvelope (Dan Baston)
+  - #4029, Add ST_QuantizeCoordinates (Dan Baston)
+  - #4063, Optional false origin point for ST_Scale (Paul Ramsey)
+  - #4082, Add ST_BandFileSize and ST_BandFileTimestamp,
+           extend ST_BandMetadata (Even Rouault)
+  - #2597, Add ST_Grayscale (Bborie Park)
+  - #4007, Add ST_SetBandPath (Bborie Park)
+  - #4008, Add ST_SetBandIndex (Bborie Park)
+
+* Breaking Changes *
+  - #4054, ST_SimplifyVW changed from > tolerance to >= tolerance
+  - #3885, version number removed from address_standardize lib file
+          (Regina Obe)
+  - #3893, raster support functions can only be loaded in the same schema
+           with core PostGIS functions. (Sandro Santilli)
+  - #4035, remove dummy pgis_abs type from aggregate/collect routines.
+           (Paul Ramsey)
+  - #4069, drop support for GEOS < 3.5 and PostgreSQL < 9.4 (Regina Obe)
+  - #4082, ST_BandMetaData extended to include filesize, timestamp (Even Rouault)
+
+* Enhancements and Fixes*
+  - Upgrade scripts from multiple old versions are now all symlinks
+    to a single upgrade script (Sandro Santilli)
+  - #3944, Update to EPSG register v9.2 (Even Rouault)
+  - #3927, Parallel implementation of ST_AsMVT
+  - #3925, Simplify geometry using map grid cell size before generating MVT
+  - #3899, BTree sort order is now defined on collections of EMPTY and
+           same-prefix geometries (Darafei Praliaskouski)
+  - #3864, Performance improvement for sorting POINT geometries
+           (Darafei Praliaskouski)
+  - #3900, GCC warnings fixed, make -j is now working (Darafei Praliaskouski)
+  - TopoGeo_addLinestring robustness improvements (Sandro Santilli)
+    #1855, #1946, #3718, #3838
+  - #3234, Do not accept EMPTY points as topology nodes (Sandro Santilli)
+  - #1014, Hashable geometry, allowing direct use in CTE signatures (Paul Ramsey)
+  - #3097, Really allow MULTILINESTRING blades in ST_Split() (Paul Ramsey)
+  - #3942, geojson: Do not include private header for json-c >= 0.13 (Björn Esser)
+  - #3954, ST_GeometricMedian now supports point weights (Darafei Praliaskouski)
+  - #3965, #3971, #3977, #4071 ST_ClusterKMeans rewritten: better initialization,
+           faster convergence, K=2 even faster (Darafei Praliaskouski)
+  - #3982, ST_AsEncodedPolyline supports LINESTRING EMPTY and MULTIPOINT EMPTY
+           (Darafei Praliaskouski)
+  - #3986, ST_AsText now has second argument to limit decimal digits
+           (Marc Ducobu, Darafei Praliaskouski)
+  - #4020, Casting from box3d to geometry now returns correctly connected
+           PolyhedralSurface (Matthias Bay)
+  - #2508, ST_OffsetCurve now works with collections (Darafei Praliaskouski)
+  - #4006, ST_GeomFromGeoJSON support for json and jsonb as input
+           (Paul Ramsey, Regina Obe)
+  - #4038, ST_Subdivide now selects pivot for geometry split that reuses input
+           vertices. (Darafei Praliaskouski)
+  - #4025, #4032 Fixed precision issue in ST_ClosestPointOfApproach,
+           ST_DistanceCPA, and ST_CPAWithin (Paul Ramsey, Darafei Praliaskouski)
+  - #4076, Reduce use of GEOS in topology implementation (Björn Harrtell)
+  - #4080, Add external raster band index to ST_BandMetaData
+  - Add Raster Tips section to Documentation for information about
+    Raster behavior (e.g. Out-DB performance, maximum open files)
+  - #4084: Fixed wrong code-comment regarding front/back of BOX3D (Matthias Bay)
+  - #4060, #4094, PostgreSQL JIT support (Raúl Marín, Laurenz Albe)
+  - #3960, ST_Centroid now uses lwgeom_centroid (Darafei Praliaskouski)
+  - #4027, Remove duplicated code in lwgeom_geos (Darafei Praliaskouski,
+           Daniel Baston)
+  - #4115, Fix a bug that created MVTs with incorrect property values under
+    parallel plans (Raúl Marín).
+  - #4120, ST_AsMVTGeom: Clip using tile coordinates (Raúl Marín).
+  - #4132, ST_Intersection on Raster now works without throwing TopologyException
+          (Vinícius A.B. Schmidt, Darafei Praliaskouski)
+  - #4177, #4180 Support for PostgreSQL 12 dev branch (Laurenz Albe, Raúl Marín)
+  - #4156, ST_ChaikinSmoothing: also smooth start/end point of
+  polygon by default (Darafei Praliaskouski)
+
+PostGIS 2.5.0rc2
+2018/09/16
+Refer to https://trac.osgeo.org/postgis/browser/tags/2.5.0rc2/NEWS
+
+PostGIS 2.5.0rc1
+2018/08/19
+Refer to https://trac.osgeo.org/postgis/browser/tags/2.5.0rc1/NEWS
+
+PostGIS 2.5.0beta2
+2018/08/11
+Refer to https://trac.osgeo.org/postgis/browser/tags/2.5.0beta2/NEWS
+
+
+PostGIS 2.5.0beta1
+2018/07/03
+Refer to https://trac.osgeo.org/postgis/browser/tags/2.5.0beta1/NEWS
+
+
+PostGIS 2.5.0alpha
+2018/05/28
+Refer to https://trac.osgeo.org/postgis/browser/tags/2.5.0alpha/NEWS
+
+
 PostGIS 2.4.4
 2018/04/08
 
@@ -18,6 +131,7 @@ PostGIS 2.4.4
            (Paul Ramsey, Darafei Praliaskouski)
   - #4052, schema qualify several functions in geography (Regina Obe)
   - #4055, ST_ClusterIntersecting drops SRID (Daniel Baston)
+  - #4067, Guard lookup of namespace in internal call case
 
  * Enhancements *
   - #3946, Compile support for PgSQL 11 (Paul Ramsey)
@@ -77,7 +191,6 @@ PostGIS 2.4.1
  * Enhancements *
   - #3815, Tiger 2017 data support and option to load zcta5
 
-
 PostGIS 2.4.0
 2017/09/30
 
@@ -127,37 +240,6 @@ PostGIS 2.4.0
   - #3844, Make = operator a strict equality test, and < > to rough "spatial sorting"
   - #3855, ST_AsTWKB memory and speed improvements
 
-
-* Breaking Changes *
-  - Dropped support for PostgreSQL 9.2.
-  - #3810, GEOS 3.4.0 or above minimum required to compile
-  - Most aggregates now marked as parallel safe,
-    which means most aggs have to be dropped / recreated.
-    If you have views that utilize PostGIS aggs,
-    you'll need to drop before upgrade and recreate after upgrade
-  - #3578, ST_NumInteriorRings(POLYGON EMPTY) now returns 0 instead of NULL
-  - _ST_DumpPoints removed, was no longer needed after PostGIS 2.1.0
-    when ST_DumpPoints got reimplemented in C
-  - B-Tree index operators < = > changed to provide better spatial locality on sorting
-    and have expected behavior on GROUP BY.
-    If you have btree index for geometry or geography, you need to REINDEX it, or review
-    if it was created by accident and needs to be replaced with GiST index.
-    If your code relies on old left-to-right box compare ordering,
-    update it to use << >> operators
-
-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 *
@@ -186,7 +268,6 @@ 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.0beta1
 2017/09/02
 See PostGIS 2.4.0 section for details
@@ -1341,8 +1422,7 @@ PostGIS 1.5.2
      (Mark Cave-Ayland)
    - #504 shp2pgsql should rename xmin/xmax fields (Sandro Santilli)
    - #458 postgis_comments being installed in contrib instead of
-     version folder (Mark Cave-Ayland)
-   - #474 Analyzing a table with geography column crashes server
+     version fozing a table with geography column crashes server
      (Paul Ramsey)
    - #581 LWGEOM-expand produces inconsistent results
      (Mark Cave-Ayland)

README.md

 Debbie:
-   [![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_2.4)](https://debbie.postgis.net/view/PostGIS/job/PostGIS_2.4/)
+   [![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_2.5)](https://debbie.postgis.net/view/PostGIS/job/PostGIS_2.5/)
 Winnie:
- [![Build Status](https://debbie.postgis.net:444/buildStatus/icon?job=PostGIS_2.4)](https://debbie.postgis.net:444/view/PostGIS/job/PostGIS_2.4/)
+ [![Build Status](https://debbie.postgis.net:444/buildStatus/icon?job=PostGIS_2.5)](https://debbie.postgis.net:444/view/PostGIS/job/PostGIS_2.5/)
 Dronie:
- [![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)
+ [![Build Status](https://drone.osgeo.org/api/badges/postgis/postgis/status.svg?branch=svn-2.5)](https://drone.osgeo.org/postgis/postgis?branch=svn-2.5)
 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-2.4/build.svg)](https://gitlab.com/postgis/postgis/commits/svn-2.4)
+ [![Gitlab-CI](https://gitlab.com/postgis/postgis/badges/svn-2.5/build.svg)](https://gitlab.com/postgis/postgis/commits/svn-2.5)
 
 This file is here to play nicely with modern code repository facilities.
 Actual readme is [here](README.postgis).

README.postgis

 PostGIS - Geographic Information Systems Extensions to PostgreSQL
 =================================================================
 
-:Version: 2.4.4
-:Date: 2017-04-08
+:Version: 2.5.0rc1
+:Date: 2018-08-19
 :Website: http://postgis.net
 
 This distribution contains a module which implements GIS simple features, ties
@@ -31,19 +31,19 @@ Directory structure::
 REQUIREMENTS
 ------------
 
-PostGIS is compatible with PostgreSQL 9.3 and above.
+PostGIS is compatible with PostgreSQL 9.4 and above.
 
 You *must* have the full PostgreSQL - including server headers - installed for
 this to work.
 
-* PROJ4 (Required, Version 4.6.0 or higher):
+* PROJ4 (Required, Version 4.9.0 or higher):
 
   The PROJ4 catographic projection library is required if you want to use the
   ST_Transform() function to reproject features within the database.
 
     http://trac.osgeo.org/proj/
 
-* GEOS (Required, Version 3.4 or higher)
+* GEOS (Required, Version 3.5 or higher)
   - 3.6+ is strongly recommended to expose most GEOS features
   - 3.7+ is needed just for the ST_FrechetDistance function
 
@@ -202,7 +202,7 @@ UPGRADING EXISTING SPATIAL DATABASES
 
 Upgrade PostGIS using the "ALTER EXTENSION" facility.
 
-  ALTER EXTENSION postgis UPDATE;
+  ALTER EXTENSION postgis UPDATE TO '2.2.0';
 
 
 USAGE

STYLE

@@ -15,21 +15,25 @@ from time to time, we will eventually get there.
 
 :Formatting:
 
-All C code should use an ANSI standard formatting with tabs for block
+Most C code should use an ANSI standard formatting with tabs for block
 indenting. When not block indenting, use spaces. To convert a file
 to the standard format use:
 
   astyle --style=ansi --indent=tab
 
+Some files use space indenting instead (check .editorconfig for info).
+For them, you can use:
+
+  astyle --style=ansi --indent=spaces=2
+
 Do not get too happy with this command. If you want to re-format a file you
 are working on:
 
  a) run astyle on it
  b) commit
  c) do your work
- d) commit
- e) if you are really finicky run astyle again
- f) commit
+ d) run astyle again
+ e) commit
 
 The idea is to avoid combining style-only commits and commits that change
 logic, so the logic commits are easier to read.

Version.config

@@ -4,8 +4,8 @@
 # See HOWTO_RELEASE file in SVN for definitions of those three.
 
 POSTGIS_MAJOR_VERSION=2
-POSTGIS_MINOR_VERSION=4
-POSTGIS_MICRO_VERSION=4
+POSTGIS_MINOR_VERSION=5
+POSTGIS_MICRO_VERSION=0
 
 # Liblwgeom interface versioning, reset to 0:0:0 (cur:age:rev)
 # when changing POSTGIS_MINOR_VERSION
@@ -19,3 +19,4 @@ LIBLWGEOM_IFACE_AGE=0
 # Revision of current interface, set to 0 when adding an interface
 # or increment when just changing implementations.
 LIBLWGEOM_IFACE_REV=0
+

aclocal.m4

-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
 
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -12,7 +12,7 @@
 # PARTICULAR PURPOSE.
 
 m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
-# Copyright (C) 2003-2017 Free Software Foundation, Inc.
+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,

astyle.sh

@@ -20,8 +20,24 @@ fi
 # Find all "pure" C files in the codebase
 #   - not .in.c used for .sql generation
 #   - not lex.yy.c or wktparse.tab.c as these are generated files
-CFILES=`find . -name '*.c' -not \( -name '*_parse.c' -o -name '*_lex.c' \)`
+#   - not topology/* files
+CFILES_TAB=`find . -name '*.c' -not \( \
+  -name '*_parse.c' -o \
+  -name '*_lex.c' -o \
+  -name './topology/*' -o \
+  -name './liblwgeom/liblwgeom_topo.*' \
+\)`
 
 # Run the standard format on the files, and do not
 # leave .orig files around for altered files.
-astyle --style=ansi --indent=tab --suffix=none $CFILES
+astyle --style=ansi --indent=tab --suffix=none $CFILES_TAB
+
+# Find all "pure" C files in the codebase
+#   - not .in.c used for .sql generation
+#   - not lex.yy.c or wktparse.tab.c as these are generated files
+#   - not topology/* files
+CFILES_SPACE="liblwgeom/*.c topology/*.c"
+
+# Run the standard format on the files, and do not
+# leave .orig files around for altered files.
+astyle --style=ansi --indent=spaces=2 --suffix=none $CFILES_SPACE

build-aux/install-sh

 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2014-09-12.12; # UTC
+scriptversion=2018-03-11.20; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -271,15 +271,18 @@ do
     fi
     dst=$dst_arg
 
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
+    # If destination is a directory, append the input filename.
     if test -d "$dst"; then
       if test "$is_target_a_directory" = never; then
         echo "$0: $dst_arg: Is a directory" >&2
         exit 1
       fi
       dstdir=$dst
-      dst=$dstdir/`basename "$src"`
+      dstbase=`basename "$src"`
+      case $dst in
+	*/) dst=$dst$dstbase;;
+	*)  dst=$dst/$dstbase;;
+      esac
       dstdir_status=0
     else
       dstdir=`dirname "$dst"`
@@ -288,6 +291,11 @@ do
     fi
   fi
 
+  case $dstdir in
+    */) dstdirslash=$dstdir;;
+    *)  dstdirslash=$dstdir/;;
+  esac
+
   obsolete_mkdir_used=false
 
   if test $dstdir_status != 0; then
@@ -324,14 +332,16 @@ do
             # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
             ;;
           *)
-            # $RANDOM is not portable (e.g. dash);  use it when possible to
-            # lower collision chance
+            # Note that $RANDOM variable is not portable (e.g. dash);  Use it
+            # here however when possible just to lower collision chance.
             tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+
             trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
 
-            # As "mkdir -p" follows symlinks and we work in /tmp possibly;  so
-            # create the $tmpdir first (and fail if unsuccessful) to make sure
-            # that nobody tries to guess the $tmpdir name.
+            # Because "mkdir -p" follows existing symlinks and we likely work
+            # directly in world-writeable /tmp, make sure that the '$tmpdir'
+            # directory is successfully created first before we actually test
+            # 'mkdir -p' feature.
             if (umask $mkdir_umask &&
                 $mkdirprog $mkdir_mode "$tmpdir" &&
                 exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
@@ -434,8 +444,8 @@ do
   else
 
     # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
+    dsttmp=${dstdirslash}_inst.$$_
+    rmtmp=${dstdirslash}_rm.$$_
 
     # Trap to clean up those temp files at exit.
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
@@ -500,9 +510,9 @@ do
 done
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End: