CVS commit: pkgsrc/databases/postgresql-postgis2

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Nov  1 13:48:41 UTC 2021

Modified Files:
        pkgsrc/databases/postgresql-postgis2: Makefile distinfo
Added Files:
        pkgsrc/databases/postgresql-postgis2/patches: patch-loader_Makefile.in

Log Message:
postgis: Respect LDFLAGS in shp2pgsql build

Resolves RELRO check failure.  Filed upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 pkgsrc/databases/postgresql-postgis2/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/databases/postgresql-postgis2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/postgresql-postgis2/patches/patch-loader_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/postgresql-postgis2/Makefile
diff -u pkgsrc/databases/postgresql-postgis2/Makefile:1.102 pkgsrc/databases/postgresql-postgis2/Makefile:1.103
--- pkgsrc/databases/postgresql-postgis2/Makefile:1.102 Thu Oct 21 20:33:04 2021
+++ pkgsrc/databases/postgresql-postgis2/Makefile       Mon Nov  1 13:48:41 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 2021/10/21 20:33:04 kim Exp $
+# $NetBSD: Makefile,v 1.103 2021/11/01 13:48:41 gdt Exp $
 
 # Note that the directory is still postgis2, for historical reasons.
 # It remains, due to inertia, until there is a good basis to be sure
@@ -6,7 +6,7 @@
 MAJOR=         3.1
 DISTNAME=      postgis-${MAJOR}.4
 PKGNAME=       postgresql${PGSQL_VERSION}-${DISTNAME}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    databases geography
 MASTER_SITES=  https://download.osgeo.org/postgis/source/
 

Index: pkgsrc/databases/postgresql-postgis2/distinfo
diff -u pkgsrc/databases/postgresql-postgis2/distinfo:1.29 pkgsrc/databases/postgresql-postgis2/distinfo:1.30
--- pkgsrc/databases/postgresql-postgis2/distinfo:1.29  Tue Oct 26 10:09:46 2021
+++ pkgsrc/databases/postgresql-postgis2/distinfo       Mon Nov  1 13:48:41 2021
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.29 2021/10/26 10:09:46 nia Exp $
+$NetBSD: distinfo,v 1.30 2021/11/01 13:48:41 gdt Exp $
 
 BLAKE2s (postgis-3.1.4.tar.gz) = 5d3f5e119436ff80204ed6307cba6b03db09e10780e4102012ffe03ec6093516
 SHA512 (postgis-3.1.4.tar.gz) = afd84b45b146bdae310580fc9f8a878dd658f9e74f99c41f5d143f32974d5f5017ab4190855dcaea915a31ac2a78d34bf5561f206965264de3252f2c2ac57683
 Size (postgis-3.1.4.tar.gz) = 17269391 bytes
+SHA1 (patch-loader_Makefile.in) = 2486bcb91f8ffa3a5b397ef3bffe4bfbdf1936f5

Added files:

Index: pkgsrc/databases/postgresql-postgis2/patches/patch-loader_Makefile.in
diff -u /dev/null pkgsrc/databases/postgresql-postgis2/patches/patch-loader_Makefile.in:1.1
--- /dev/null   Mon Nov  1 13:48:41 2021
+++ pkgsrc/databases/postgresql-postgis2/patches/patch-loader_Makefile.in       Mon Nov  1 13:48:41 2021
@@ -0,0 +1,17 @@
+$NetBSD: patch-loader_Makefile.in,v 1.1 2021/11/01 13:48:41 gdt Exp $
+
+Respect LDFLAGS for shp2pgsql etc.
+
+https://trac.osgeo.org/postgis/ticket/5016
+
+--- loader/Makefile.in.orig    2021-09-04 05:03:42.000000000 +0000
++++ loader/Makefile.in
+@@ -28,6 +28,8 @@ SHELL = @SHELL@
+ INSTALL = @INSTALL@
+ LIBTOOL = @LIBTOOL@
+ 
++LDFLAGS = @LDFLAGS@
++
+ # Filenames with extension as determined by the OS
+ POSTGIS-CLI=postgis@EXESUFFIX@
+ PGSQL2SHP-CLI=pgsql2shp@EXESUFFIX@