CVS commit: pkgsrc/geography/gama

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Dec 19 14:18:03 UTC 2024

Modified Files:
        pkgsrc/geography/gama: Makefile

Log Message:
geography/gama: Stop using ancient vendored expat

gama has a vendored ancient expat (to accomodate users of deficient
operating systems).  The build defaults to using it; this is of course
a bug and has been reported upstream.  This commit makes two changes:
  - in post-extract, remove the old expat sources to guard against use
  - pass a configure flag to look for expat normally

Adjust comments about gmake (upstream documents that now) and a
missing test depends (not changed due to freeze).

Builds and passes tests on NetBSD 10 amd64.  Likely works elsewhere,
but this is a security bug and it's better to have it fail and fix
with a pullup than leave it.  (gama is a leaf package.)


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 pkgsrc/geography/gama/Makefile

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

Modified files:

Index: pkgsrc/geography/gama/Makefile
diff -u pkgsrc/geography/gama/Makefile:1.74 pkgsrc/geography/gama/Makefile:1.75
--- pkgsrc/geography/gama/Makefile:1.74 Thu Nov 14 22:20:00 2024
+++ pkgsrc/geography/gama/Makefile      Thu Dec 19 14:18:03 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.74 2024/11/14 22:20:00 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2024/12/19 14:18:03 gdt Exp $
 #
 
 DISTNAME=      gama-2.31
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    geography
 MASTER_SITES=  ${MASTER_SITE_GNU:=gama/}
 
@@ -14,14 +14,21 @@ LICENSE=    gnu-gpl-v2 # or later
 USE_LANGUAGES+=                c c++
 USE_CXX_FEATURES+=     c++14
 
-# Not documented, but apparent.
 USE_TOOLS+=            gmake
 
+# Upstream vendors an ancient copy of expat with many security issues.
+# Remove it to ensure that it cannot be used.
+post-extract:
+       cd ${WRKSRC} && rm -rf lib/expat
+
 GNU_CONFIGURE=         yes
+# Remediate upstream default vendoring.
+CONFIGURE_ARGS+=       --disable-expat_1_1
 
 INFO_FILES=            yes
 
 TEST_TARGET=           check
+# \todo Some tests use xmllint.
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"