[postgis-tickets] [SCM] PostGIS branch stable-3.2 updated. 3.2.0-32-g5fae8e542

Sat Feb 12 16:20:34 PST 2022

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  5fae8e542ac40ffb2f01c8bcecb1f95d64c1b3a7 (commit)
       via  ecad675f3c102771ea930ce9bad5ca91d220d076 (commit)
      from  b0458b851d9d022941a76ee19ce4752a307970fa (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 5fae8e542ac40ffb2f01c8bcecb1f95d64c1b3a7
Author: Regina Obe <lr at pcorp.us>
Date:   Sat Feb 12 19:20:28 2022 -0500

    Update News, docs, and general prep for 3.2.1 release

diff --git a/HOWTO_RELEASE b/HOWTO_RELEASE
index 16c57974c..5f3a0fbed 100644
--- a/HOWTO_RELEASE
+++ b/HOWTO_RELEASE
@@ -1,6 +1,6 @@
 How to release
 ~~~~~~~~~~~~~~
-Date: 2020-02-23
+Date: 2020-02-13
 
 Versioning Scheme
 -----------------
diff --git a/NEWS b/NEWS
index 81b0045d2..e4df8b33a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
-PostGIS 3.2.1dev
-2022/02/DD
+PostGIS 3.2.1
+2022/02/12
 
 * Bug Fixes *
   - #5033, #5035, allow upgrades in presence of views using deprecated
@@ -12,6 +12,9 @@ PostGIS 3.2.1dev
   - #5076, stop install when pgaudit is active (Paul Ramsey)
   - #5069, search_path vulnerabilty during install/upgrade
            (Regina Obe)
+  - #5090, #5091 configure --with-protobuf-lib / --with-protobufdir
+           , --without-protobuf broken (Tobias Bussmann)
+
 
 
 PostGIS 3.2.0 (Olivier Courtin Edition)
diff --git a/README.postgis b/README.postgis
index 0b84fb92d..a7483d9fd 100644
--- a/README.postgis
+++ b/README.postgis
@@ -1,8 +1,8 @@
 PostGIS - Geographic Information Systems Extensions to PostgreSQL
 =================================================================
 
-:Version: 3.2.0
-:Date: 2021-12-17
+:Version: 3.2.1
+:Date: 2022-02-12
 :Website: https://postgis.net
 
 This distribution contains a module which implements GIS simple features, ties
diff --git a/Version.config b/Version.config
index a2d89275b..849bfe701 100644
--- a/Version.config
+++ b/Version.config
@@ -5,7 +5,7 @@
 
 POSTGIS_MAJOR_VERSION=3
 POSTGIS_MINOR_VERSION=2
-POSTGIS_MICRO_VERSION=1dev
+POSTGIS_MICRO_VERSION=1
 
 # Liblwgeom interface versioning, reset to 0:0:0 (cur:age:rev)
 # when changing POSTGIS_MINOR_VERSION
diff --git a/doc/release_notes.xml b/doc/release_notes.xml
index 0262cc04e..e6cb6b2ef 100644
--- a/doc/release_notes.xml
+++ b/doc/release_notes.xml
@@ -4,7 +4,7 @@
    <subtitle>Release Notes</subtitle>
     <sect1>
         <title>PostGIS 3.2.1</title>
-        <para>2022/02/13</para>
+        <para>2022/02/12</para>
         <para>This version requires PostgreSQL 9.6 or higher, GEOS 3.6 or higher, and Proj 4.9+
             Additional features are enabled if you are running GEOS 3.9+
             (and ST_MakeValid enhancements with 3.10+),
@@ -21,6 +21,8 @@
             <para>5076, stop install when pgaudit is active (Paul Ramsey)</para>
             <para>5069, search_path vulnerabilty during install/upgrade
                     (Regina Obe)</para>
+            <para>5090, 5091 configure --with-protobuf-lib /
+                --with-protobufdir, --without-protobuf broken (Tobias Bussmann)</para>
         </simplesect>
     </sect1>
 

commit ecad675f3c102771ea930ce9bad5ca91d220d076
Author: Regina Obe <lr at pcorp.us>
Date:   Sat Feb 12 19:10:02 2022 -0500

    Closes #5090 for PostGIS 3.2.1
    Closes #5091 for PostGIS 3.2.1
    Fix --with-protobuf-lib / --with-protobufdir broken
    References https://github.com/postgis/postgis/pull/662
    References https://github.com/postgis/postgis/pull/663

diff --git a/configure.ac b/configure.ac
index f41bbfb2a..f07ee41d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1013,7 +1013,7 @@ if test "$CHECK_PROTOBUF" != "no"; then
 			if test "x$withval" = "xyes"; then
 				AC_MSG_ERROR([you must specify a parameter to --with-protobufdir, e.g. --with-protobufdir=/usr/local])
 			else
-				PROTOBUF_LDFLAGS="-L$withval/lib";
+				PROTOBUF_LDFLAGS="-L$withval/lib -lprotobuf-c";
 				PROTOBUF_CPPFLAGS="-I$withval/include"
 			fi
 		], [])
@@ -1025,7 +1025,7 @@ if test "$CHECK_PROTOBUF" != "no"; then
 
 	AC_ARG_WITH([protobuf-lib],
 		[AS_HELP_STRING([--with-protobuf-lib=PATH], [libprotobuf-c.so/dll/dylib library installation directory])], [
-			PROTOBUF_LDFLAGS="-L$withval"
+			PROTOBUF_LDFLAGS="-L$withval -lprotobuf-c"
 		],[])
 
 	if test -n "$PROTOBUF_CPPFLAGS"; then
@@ -1043,8 +1043,11 @@ if test "$CHECK_PROTOBUF" != "no"; then
 	)
 
 	dnl confirm that discovered/configured library path works
-	AC_CHECK_LIB([protobuf-c], [protobuf_c_message_init],
-		[],
+	AC_CHECK_LIB([protobuf-c], [protobuf_c_message_init],[
+			if test "x$PROTOBUF_LDFLAGS" = "x"; then
+				PROTOBUF_LDFLAGS="-lprotobuf-c"
+			fi
+		],
 		AC_MSG_ERROR([unable to link protobuf-c using $LDFLAGS. You can disable MVT and Geobuf support using --without-protobuf])
 		HAVE_PROTOBUF=no
 	)

-----------------------------------------------------------------------

Summary of changes:
 HOWTO_RELEASE         |  2 +-
 NEWS                  |  7 +++++--
 README.postgis        |  4 ++--
 Version.config        |  2 +-
 configure.ac          | 11 +++++++----
 doc/release_notes.xml |  4 +++-
 6 files changed, 19 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
PostGIS
