summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgdt <gdt@pkgsrc.org>2020-03-11 22:55:48 +0000
committergdt <gdt@pkgsrc.org>2020-03-11 22:55:48 +0000
commitc0f9808ec247a6893a29d65e4f80ed963d595da6 (patch)
tree4ecf6b75b3f9fee72ce18cd8807269a62e1bc0e6
parentefc36334d08dbd1bfc6bdda3df00b3d9721b310b (diff)
downloadpkgsrc-c0f9808ec247a6893a29d65e4f80ed963d595da6.tar.gz
geography/geos: Improve patch comment
-rw-r--r--geography/geos/distinfo4
-rw-r--r--geography/geos/patches/patch-capi_geos__ts__c.cpp7
2 files changed, 7 insertions, 4 deletions
diff --git a/geography/geos/distinfo b/geography/geos/distinfo
index c5552bd78a6..44656e8c4d1 100644
--- a/geography/geos/distinfo
+++ b/geography/geos/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.32 2020/03/11 22:15:16 gdt Exp $
+$NetBSD: distinfo,v 1.33 2020/03/11 22:55:48 gdt Exp $
SHA1 (geos-3.8.1.tar.bz2) = dbd165752dd4c48d81a84aa51c99d04410d96c67
RMD160 (geos-3.8.1.tar.bz2) = 16b9b4dba1c772c561bace8e3e7c514f78fd4037
SHA512 (geos-3.8.1.tar.bz2) = 1d8d8b3ece70eb388ea128f4135c7455899f01828223b23890ad3a2401e27104efce03987676794273a9b9d4907c0add2be381ff14b8420aaa9a858cc5941056
Size (geos-3.8.1.tar.bz2) = 2505407 bytes
SHA1 (patch-ae) = d566a7cc7fdbb29cb7f39d6e0e4adf525213f62c
-SHA1 (patch-capi_geos__ts__c.cpp) = 72328164bbb870d51b4acfc81838f99c393d30c1
+SHA1 (patch-capi_geos__ts__c.cpp) = 513a5b4c40afacbe580cc3e5364a66ea9f98f3ee
diff --git a/geography/geos/patches/patch-capi_geos__ts__c.cpp b/geography/geos/patches/patch-capi_geos__ts__c.cpp
index 8427f14321f..7f726ddf0b3 100644
--- a/geography/geos/patches/patch-capi_geos__ts__c.cpp
+++ b/geography/geos/patches/patch-capi_geos__ts__c.cpp
@@ -1,7 +1,10 @@
-$NetBSD: patch-capi_geos__ts__c.cpp,v 1.4 2020/03/11 22:15:16 gdt Exp $
+$NetBSD: patch-capi_geos__ts__c.cpp,v 1.5 2020/03/11 22:55:48 gdt Exp $
The geos code passes an object of type std::string to variadic functions
-NOTICE_MESSAGE and ERROR_MESSAGE. Passing non-POD types is UB.
+
+NOTICE_MESSAGE and ERROR_MESSAGE, which then pass them to va_start.
+Use of non-POD types with varargs is "conditionally supported", which
+without a fixed compiler becomes UB.
To avoid this, change the functions to take const char * rather than
std::string (and adjust the use of the variables in the functions).