CVS commit: pkgsrc/net/fstrm

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Mon Dec 16 12:52:24 UTC 2019

Modified Files:
        pkgsrc/net/fstrm: Makefile
Added Files:
        pkgsrc/net/fstrm/patches: patch-libmy_argv.c

Log Message:
Fix format / buffer size warnings with newer gcc (7.4.0) by
also leaving room for the terminating 0 character.
Also submitted as https://github.com/farsightsec/fstrm/pull/63
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/fstrm/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/net/fstrm/patches/patch-libmy_argv.c

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

Modified files:

Index: pkgsrc/net/fstrm/Makefile
diff -u pkgsrc/net/fstrm/Makefile:1.5 pkgsrc/net/fstrm/Makefile:1.6
--- pkgsrc/net/fstrm/Makefile:1.5       Mon Oct 14 17:47:24 2019
+++ pkgsrc/net/fstrm/Makefile   Mon Dec 16 12:52:23 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2019/10/14 17:47:24 he Exp $
+# $NetBSD: Makefile,v 1.6 2019/12/16 12:52:23 he Exp $
 
 DISTNAME=      fstrm-0.6.0
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=farsightsec/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}

Added files:

Index: pkgsrc/net/fstrm/patches/patch-libmy_argv.c
diff -u /dev/null pkgsrc/net/fstrm/patches/patch-libmy_argv.c:1.1
--- /dev/null   Mon Dec 16 12:52:24 2019
+++ pkgsrc/net/fstrm/patches/patch-libmy_argv.c Mon Dec 16 12:52:23 2019
@@ -0,0 +1,24 @@
+$NetBSD: patch-libmy_argv.c,v 1.1 2019/12/16 12:52:23 he Exp $
+
+Include space for the terminating 0 character.
+
+--- libmy/argv.c.orig  2019-10-14 16:25:11.000000000 +0000
++++ libmy/argv.c
+@@ -482,7 +482,7 @@ static     int     expand_buf(const void *buf, c
+       if (out_p + 2 >= max_p) {
+       break;
+       }
+-      LOC_SNPRINTF(SNP_ARG(out_p, 2), "\\%c", *(spec_p - 1));
++      LOC_SNPRINTF(SNP_ARG(out_p, 3), "\\%c", *(spec_p - 1));
+       out_p += 2;
+       continue;
+     }
+@@ -499,7 +499,7 @@ static     int     expand_buf(const void *buf, c
+       if (out_p + 4 >= max_p) {
+       break;
+       }
+-      LOC_SNPRINTF(SNP_ARG(out_p, 4), "\\%03o", *buf_p);
++      LOC_SNPRINTF(SNP_ARG(out_p, 5), "\\%03o", *buf_p);
+       out_p += 4;
+     }
+   }