From 3295ef793154df75440ac9fd31d46f1c722fd6fd Mon Sep 17 00:00:00 2001
From: maya <maya@pkgsrc.org>
Date: Sat, 11 Nov 2017 17:28:39 +0000
Subject: netcat6: fix buffer overflow. appease pkglint. bump PKGREVISION.

---
 net/netcat6/Makefile                 |  7 ++++---
 net/netcat6/distinfo                 |  5 +++--
 net/netcat6/patches/patch-aa         |  4 +++-
 net/netcat6/patches/patch-src_misc.c | 21 +++++++++++++++++++++
 4 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 net/netcat6/patches/patch-src_misc.c

(limited to 'net/netcat6')

diff --git a/net/netcat6/Makefile b/net/netcat6/Makefile
index 72199e50c53..be67b73a91d 100644
--- a/net/netcat6/Makefile
+++ b/net/netcat6/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.9 2013/04/13 07:55:02 ghen Exp $
+# $NetBSD: Makefile,v 1.10 2017/11/11 17:28:39 maya Exp $
 
 DISTNAME=		nc6-1.0
 PKGNAME=		${DISTNAME:S/nc/netcat/}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/
 MASTER_SITES+=		http://ftp.deepspace6.net/pub/ds6/sources/nc6/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-COMMENT=		Network swiss army knife
 HOMEPAGE=		http://www.deepspace6.net/projects/netcat6.html
+COMMENT=		Network swiss army knife
+LICENSE=		gnu-gpl-v2
 
 GNU_CONFIGURE=		yes
 
diff --git a/net/netcat6/distinfo b/net/netcat6/distinfo
index 1e70ffd17a2..053848b33d6 100644
--- a/net/netcat6/distinfo
+++ b/net/netcat6/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2015/11/04 00:35:15 agc Exp $
+$NetBSD: distinfo,v 1.7 2017/11/11 17:28:39 maya Exp $
 
 SHA1 (nc6-1.0.tar.bz2) = 1c361a8060be427fe1b2209d7155e26670e0c1b9
 RMD160 (nc6-1.0.tar.bz2) = c5444976925ffece7f27fc1ff3c16ebe19998b78
 SHA512 (nc6-1.0.tar.bz2) = 199f3bd18bb452544da8ca1b0f5347f79662bea81e9af335a41ed62c12d5d8cb41d99442ca54f301538d27aec4ada5f59db87461e5b0f20333ba1b52859bd35a
 Size (nc6-1.0.tar.bz2) = 264257 bytes
-SHA1 (patch-aa) = 291ace89bef4e89a24bfc61c8b53104d00811657
+SHA1 (patch-aa) = f1e941b277358c9f0922be977fa00b4b2f349230
+SHA1 (patch-src_misc.c) = 0d9d0bf4c273ede0ff4cb0bc405e6831339d1cb1
diff --git a/net/netcat6/patches/patch-aa b/net/netcat6/patches/patch-aa
index d387688a8c4..5ff40995d41 100644
--- a/net/netcat6/patches/patch-aa
+++ b/net/netcat6/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2006/07/07 18:47:52 ghen Exp $
+$NetBSD: patch-aa,v 1.6 2017/11/11 17:28:39 maya Exp $
+
+Don't try to define alloca on BSDs
 
 --- src/netsupport.c.orig	2006-03-14 01:33:01.000000000 +0000
 +++ src/netsupport.c
diff --git a/net/netcat6/patches/patch-src_misc.c b/net/netcat6/patches/patch-src_misc.c
new file mode 100644
index 00000000000..c2fb4dc8eee
--- /dev/null
+++ b/net/netcat6/patches/patch-src_misc.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_misc.c,v 1.1 2017/11/11 17:28:39 maya Exp $
+
+use strdup instead of being off by one with our version
+of strdup
+
+--- src/misc.c.orig	2006-01-19 22:46:23.000000000 +0000
++++ src/misc.c
+@@ -119,9 +119,10 @@ void *xmalloc(size_t size)
+ 
+ char *xstrdup(const char *str)
+ {
+-	register char *nstr = (char *)xmalloc(strlen(str));
+-	/* we should use srtlcpy here instead of strcpy */
+-	strcpy(nstr, str);
++	register char *nstr = (char *) strdup(str);
++
++	if (nstr == NULL) fatal(_("virtual memory exhausted"));
++
+ 	return nstr;
+ }
+ 
-- 
cgit v1.2.3