CVS commit: pkgsrc/chat/ircII

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Wed Sep 26 10:38:26 UTC 2018

Modified Files:
        pkgsrc/chat/ircII: Makefile distinfo
Added Files:
        pkgsrc/chat/ircII/patches: patch-ircaux.c

Log Message:
fix problem from upstream: avoid failing to nul terminate strings, which
could lead to garbage being added to assignment values.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 pkgsrc/chat/ircII/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/chat/ircII/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/ircII/patches/patch-ircaux.c

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

Modified files:

Index: pkgsrc/chat/ircII/Makefile
diff -u pkgsrc/chat/ircII/Makefile:1.79 pkgsrc/chat/ircII/Makefile:1.80
--- pkgsrc/chat/ircII/Makefile:1.79     Thu Jul 19 22:22:21 2018
+++ pkgsrc/chat/ircII/Makefile  Wed Sep 26 10:38:26 2018
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.79 2018/07/19 22:22:21 mrg Exp $
+# $NetBSD: Makefile,v 1.80 2018/09/26 10:38:26 mrg Exp $
 
 DISTNAME=              ircii-${VERS}
 PKGNAME=               ircII-${VERS}
 CATEGORIES=            chat
 MASTER_SITES=          http://ircii.warped.com/
 EXTRACT_SUFX=          .tar.bz2
-PKGREVISION=           1
+PKGREVISION=           2
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.eterna.com.au/ircii/

Index: pkgsrc/chat/ircII/distinfo
diff -u pkgsrc/chat/ircII/distinfo:1.47 pkgsrc/chat/ircII/distinfo:1.48
--- pkgsrc/chat/ircII/distinfo:1.47     Thu Jul 19 22:22:21 2018
+++ pkgsrc/chat/ircII/distinfo  Wed Sep 26 10:38:26 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.47 2018/07/19 22:22:21 mrg Exp $
+$NetBSD: distinfo,v 1.48 2018/09/26 10:38:26 mrg Exp $
 
 SHA1 (ircii-20170704.tar.bz2) = 88f55a59af48d7ed131895d68354fe7f566e3180
 RMD160 (ircii-20170704.tar.bz2) = b857a49c6d843748b0bcbccf9e3aec16d7be974b
@@ -6,4 +6,5 @@ SHA512 (ircii-20170704.tar.bz2) = a0cdc5
 Size (ircii-20170704.tar.bz2) = 596535 bytes
 SHA1 (patch-ac) = 9f6f3b27670b63ff00b55c5431ec1da5219369ff
 SHA1 (patch-include_irc.h) = 257e7879461d88d9e8e05205e96cdec702e9e458
+SHA1 (patch-ircaux.c) = ab4d614cc20b3591a276b27ac818ed409c2116f6
 SHA1 (patch-source_names.c) = 53b22dcf43f274bb4a67c6ee016260e76c090756

Added files:

Index: pkgsrc/chat/ircII/patches/patch-ircaux.c
diff -u /dev/null pkgsrc/chat/ircII/patches/patch-ircaux.c:1.1
--- /dev/null   Wed Sep 26 10:38:26 2018
+++ pkgsrc/chat/ircII/patches/patch-ircaux.c    Wed Sep 26 10:38:26 2018
@@ -0,0 +1,34 @@
+$NetBSD: patch-ircaux.c,v 1.1 2018/09/26 10:38:26 mrg Exp $
+
+avoid trailing garbage in some variable assignments.
+
+Index: source/ircaux.c
+===================================================================
+RCS file: /home/cvs/ircii/source/ircaux.c,v
+retrieving revision 1.123
+retrieving revision 1.124
+diff -p -u -r1.123 -r1.124
+--- source/ircaux.c    4 Jul 2017 12:10:22 -0000       1.123
++++ source/ircaux.c    13 Sep 2017 21:24:56 -0000      1.124
+@@ -946,7 +946,7 @@ double_quote_work(u_char *str, u_char *s
+       }
+       if (dst && pos < dstlen)
+               dst[pos] = '\0';
+-      return pos;
++      return pos + 1;
+ }
+ 
+ /*
+@@ -961,10 +961,10 @@ double_quote(u_char *str, u_char *stuff)
+       size_t len, len2;
+ 
+       len = double_quote_work(str, stuff, NULL, 0);
+-      if (len == 0)
++      if (len == 1)
+               return empty_string();
+ 
+-      dst = new_malloc(len + 1);
++      dst = new_malloc(len);
+       len2 = double_quote_work(str, stuff, dst, len);
+       if (len != len2)
+               yell("--- double_quote() error: len %zu len2 %zu", len, len2);