CVS commit: pkgsrc/devel/samurai

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Nov 16 09:39:48 UTC 2023

Modified Files:
        pkgsrc/devel/samurai: distinfo
Added Files:
        pkgsrc/devel/samurai/patches: patch-util.c

Log Message:
samurai: Fix overlapping definition with libc.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/samurai/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/samurai/patches/patch-util.c

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

Modified files:

Index: pkgsrc/devel/samurai/distinfo
diff -u pkgsrc/devel/samurai/distinfo:1.7 pkgsrc/devel/samurai/distinfo:1.8
--- pkgsrc/devel/samurai/distinfo:1.7   Tue Oct 26 10:19:54 2021
+++ pkgsrc/devel/samurai/distinfo       Thu Nov 16 09:39:48 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:19:54 nia Exp $
+$NetBSD: distinfo,v 1.8 2023/11/16 09:39:48 nia Exp $
 
 BLAKE2s (samurai-1.2.tar.gz) = 97ec3ac8efd246ad9fdc87fef27161ce6ba95b82564fd8aabc0adc75a8583077
 SHA512 (samurai-1.2.tar.gz) = bbe6a582c34b04f1df53b76c1647aa3e03c4698ebf7591a203935f11ffa05971bbcb86dc1a8c06aeb904cdc741abb08918122810fc47216fed0a6d9f87fd1225
 Size (samurai-1.2.tar.gz) = 32709 bytes
+SHA1 (patch-util.c) = 6d2e792d0c5138139c72ca2889e06c9ff99aa8a4

Added files:

Index: pkgsrc/devel/samurai/patches/patch-util.c
diff -u /dev/null pkgsrc/devel/samurai/patches/patch-util.c:1.1
--- /dev/null   Thu Nov 16 09:39:48 2023
+++ pkgsrc/devel/samurai/patches/patch-util.c   Thu Nov 16 09:39:48 2023
@@ -0,0 +1,24 @@
+$NetBSD: patch-util.c,v 1.1 2023/11/16 09:39:48 nia Exp $
+
+Fix overlapping definition with libc.
+
+--- util.c.orig        2020-12-17 01:31:33.000000000 +0000
++++ util.c
+@@ -58,7 +58,7 @@ xmalloc(size_t n)
+ }
+ 
+ static void *
+-reallocarray(void *p, size_t n, size_t m)
++samurai_reallocarray(void *p, size_t n, size_t m)
+ {
+       if (m && n > SIZE_MAX / m) {
+               errno = ENOMEM;
+@@ -70,7 +70,7 @@ reallocarray(void *p, size_t n, size_t m
+ void *
+ xreallocarray(void *p, size_t n, size_t m)
+ {
+-      p = reallocarray(p, n, m);
++      p = samurai_reallocarray(p, n, m);
+       if (!p)
+               fatal("reallocarray:");
+