[arch-commits] Commit in librttopo/trunk (PKGBUILD postgis-15444-security-fix.patch)

[Bruno Pagani]

    Date: Monday, June 27, 2022 @ 16:12:38
  Author: archange
Revision: 1239713

Backport security fix

Added:
  librttopo/trunk/postgis-15444-security-fix.patch
Modified:
  librttopo/trunk/PKGBUILD

----------------------------------+
 PKGBUILD                         |   25 +++++++++++++------------
 postgis-15444-security-fix.patch |   23 +++++++++++++++++++++++
 2 files changed, 36 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-27 15:57:26 UTC (rev 1239712)
+++ PKGBUILD	2022-06-27 16:12:38 UTC (rev 1239713)
@@ -1,32 +1,33 @@
 # Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Maintainer: Bruno Pagani <archange at archlinux.org>
 # Contributor: Samuel Fernando Mesa <samuelmesa dot linuxmail.org>
 
 pkgname=librttopo
 pkgver=1.1.0
-pkgrel=4
+pkgrel=5
 pkgdesc="RT Topology Library"
-arch=('x86_64')
+arch=(x86_64)
 url="https://git.osgeo.org/gitea/rttopo/librttopo"
-license=('GPL2')
-depends=('geos')
-source=(https://git.osgeo.org/gitea/rttopo/$pkgname/archive/$pkgname-$pkgver.tar.gz)
-sha256sums=('2e2fcabb48193a712a6c76ac9a9be2a53f82e32f91a2bc834d9f1b4fa9cd879f')
+license=(GPL2)
+depends=(geos)
+source=(https://git.osgeo.org/gitea/rttopo/$pkgname/archive/$pkgname-$pkgver.tar.gz
+        postgis-15444-security-fix.patch)
+sha256sums=('2e2fcabb48193a712a6c76ac9a9be2a53f82e32f91a2bc834d9f1b4fa9cd879f'
+            '759e5137b49b01af7ccb4d40dcc673a004c6b1461b74d624be18787a960863fb')
 
 prepare() {
-  cd "${srcdir}"/$pkgname
-  
+  cd $pkgname
+  patch -p1 < ../postgis-15444-security-fix.patch
   ./autogen.sh
 }
 
 build() {
-  cd "${srcdir}"/$pkgname
-  
+  cd $pkgname
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}"/$pkgname
-  
+  cd $pkgname
   make DESTDIR="${pkgdir}" install
 }

Added: postgis-15444-security-fix.patch
===================================================================
--- postgis-15444-security-fix.patch	                        (rev 0)
+++ postgis-15444-security-fix.patch	2022-06-27 16:12:38 UTC (rev 1239713)
@@ -0,0 +1,23 @@
+--- a/src/rtout_x3d.c
++++ b/src/rtout_x3d.c
+@@ -63,6 +63,20 @@ rtgeom_to_x3d3(const RTCTX *ctx, const RTGEOM *geom, char *srs, int precision, i
+ {
+   int type = geom->type;
+ 
++/* apply patch postgis: https://trac.osgeo.org/postgis/changeset/15444 */
++/* https://trac.osgeo.org/postgis/ticket/3704 */
++
++/* Empty string for empties */
++  if( rtgeom_is_empty(ctx, geom) )
++  {
++    char *ret = NULL;
++    ret = rtalloc(ctx, 1);
++    ret[0] = '\0';
++    return ret;
++  }
++
++/* end patch */
++
+   switch (type)
+   {
+   case RTPOINTTYPE: