From b17de0a0a02859e76c813917dc6080a30af7fdfc Mon Sep 17 00:00:00 2001
From: agc <agc>
Date: Thu, 18 Apr 2013 04:23:17 +0000
Subject: Update security/ipv6-toolkit from version 1.3.3 to 1.3.4

Changes from previous version:
   * IPv6-host tracking support in the scan6 tool.
   * A new tool, address6, to analyze IPv6 addresses
   * Minor bug fixes
   * PDF manual pages have been removed
   * additional manual pages

pkgsrc changes:
   * patch to avoid "uninitialised variable" warning from compiler
---
 security/ipv6-toolkit/Makefile         | 17 ++++++-----------
 security/ipv6-toolkit/PLIST            | 24 +++++++++++-------------
 security/ipv6-toolkit/distinfo         |  9 +++++----
 security/ipv6-toolkit/patches/patch-aa | 15 +++++++++++++++
 4 files changed, 37 insertions(+), 28 deletions(-)
 create mode 100644 security/ipv6-toolkit/patches/patch-aa

(limited to 'security/ipv6-toolkit')

diff --git a/security/ipv6-toolkit/Makefile b/security/ipv6-toolkit/Makefile
index 48f403c750d..0ebf50be934 100644
--- a/security/ipv6-toolkit/Makefile
+++ b/security/ipv6-toolkit/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2013/03/12 20:32:00 agc Exp $
+# $NetBSD: Makefile,v 1.6 2013/04/18 04:23:17 agc Exp $
 
-DISTNAME=	ipv6-toolkit-v1.3.3
-PKGNAME=	ipv6-toolkit-1.3.3
+DISTNAME=	ipv6-toolkit-v1.3.4
+PKGNAME=	${DISTNAME:C/-v/-/}
 CATEGORIES=	security net
 MASTER_SITES=	http://www.si6networks.com/tools/ipv6toolkit/
 
@@ -12,12 +12,10 @@ LICENSE=	gnu-gpl-v3
 
 AUTO_MKDIRS=	yes
 
-BINS=		flow6 frag6 icmp6 jumbo6 na6 ni6 ns6 ra6 rd6 rs6 scan6 tcp6
-MAN1=		flow6.1 frag6.1 icmp6.1 scan6.1
+BINS=		address6 flow6 frag6 icmp6 jumbo6 na6 ni6 ns6 ra6 rd6 rs6 scan6 tcp6
+MAN1=		address6.1 flow6.1 frag6.1 icmp6.1 jumbo6.1 na6.1 ni6.1 ns6.1
+MAN1+=		ra6.1 rd6.1 rs6.1 scan6.1 tcp6.1
 MAN5=		ipv6toolkit.conf.5
-PDFS=		flow6-manual.pdf frag6-manual.pdf icmp6-manual.pdf jumbo6-manual.pdf
-PDFS+=		na6-manual.pdf ni6-manual.pdf ns6-manual.pdf ra6-manual.pdf
-PDFS+=		rd6-manual.pdf rs6-manual.pdf scan6-manual.pdf tcp6-manual.pdf
 
 do-install:
 	for f in ${BINS}; do						\
@@ -29,9 +27,6 @@ do-install:
 	for f in ${MAN5}; do						\
 		${INSTALL_MAN} ${WRKSRC}/manuals/$$f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/$$f; \
 	done
-	for f in ${PDFS}; do						\
-		${INSTALL_DATA} ${WRKSRC}/manuals/$$f ${DESTDIR}${PREFIX}/share/doc/ipv6-toolkit/$$f; \
-	done
 
 .include "../../net/libpcap/buildlink3.mk"
 
diff --git a/security/ipv6-toolkit/PLIST b/security/ipv6-toolkit/PLIST
index 61501a937f2..1ca315cd48d 100644
--- a/security/ipv6-toolkit/PLIST
+++ b/security/ipv6-toolkit/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2013/02/11 06:55:05 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/18 04:23:17 agc Exp $
+bin/address6
 bin/flow6
 bin/frag6
 bin/icmp6
@@ -11,20 +12,17 @@ bin/rd6
 bin/rs6
 bin/scan6
 bin/tcp6
+man/man1/address6.1
 man/man1/flow6.1
 man/man1/frag6.1
 man/man1/icmp6.1
+man/man1/jumbo6.1
+man/man1/na6.1
+man/man1/ni6.1
+man/man1/ns6.1
+man/man1/ra6.1
+man/man1/rd6.1
+man/man1/rs6.1
 man/man1/scan6.1
+man/man1/tcp6.1
 man/man5/ipv6toolkit.conf.5
-share/doc/ipv6-toolkit/flow6-manual.pdf
-share/doc/ipv6-toolkit/frag6-manual.pdf
-share/doc/ipv6-toolkit/icmp6-manual.pdf
-share/doc/ipv6-toolkit/jumbo6-manual.pdf
-share/doc/ipv6-toolkit/na6-manual.pdf
-share/doc/ipv6-toolkit/ni6-manual.pdf
-share/doc/ipv6-toolkit/ns6-manual.pdf
-share/doc/ipv6-toolkit/ra6-manual.pdf
-share/doc/ipv6-toolkit/rd6-manual.pdf
-share/doc/ipv6-toolkit/rs6-manual.pdf
-share/doc/ipv6-toolkit/scan6-manual.pdf
-share/doc/ipv6-toolkit/tcp6-manual.pdf
diff --git a/security/ipv6-toolkit/distinfo b/security/ipv6-toolkit/distinfo
index 871b4ce7c91..7efd7c8bb6e 100644
--- a/security/ipv6-toolkit/distinfo
+++ b/security/ipv6-toolkit/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2013/03/12 20:32:00 agc Exp $
+$NetBSD: distinfo,v 1.5 2013/04/18 04:23:17 agc Exp $
 
-SHA1 (ipv6-toolkit-v1.3.3.tar.gz) = ab21a41c632876b639c84e8e8705a624da30f4e4
-RMD160 (ipv6-toolkit-v1.3.3.tar.gz) = 08a8ca046d2435f40b78e88686d6633503542589
-Size (ipv6-toolkit-v1.3.3.tar.gz) = 2944487 bytes
+SHA1 (ipv6-toolkit-v1.3.4.tar.gz) = c9428aff0de23960de1b3385caac689e25b06aab
+RMD160 (ipv6-toolkit-v1.3.4.tar.gz) = 22c26424d4af075bc23c35ea85343d706af32b25
+Size (ipv6-toolkit-v1.3.4.tar.gz) = 1052088 bytes
+SHA1 (patch-aa) = 594fb41b77258cae0d3ba81a78144c312728faa8
diff --git a/security/ipv6-toolkit/patches/patch-aa b/security/ipv6-toolkit/patches/patch-aa
new file mode 100644
index 00000000000..ae808fdaa5e
--- /dev/null
+++ b/security/ipv6-toolkit/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.4 2013/04/18 04:23:17 agc Exp $
+
+avoid a warning from the compiler
+
+--- tools/scan6.c	2013/04/05 16:27:27	1.1
++++ tools/scan6.c	2013/04/05 16:28:20
+@@ -2666,7 +2666,7 @@
+ 
+ int load_vm_entries(struct scan_list *scan, struct scan_entry *dst, struct prefix4_entry *v4host){
+ 	unsigned int 		i;
+-	u_int32_t			mask32;
++	u_int32_t			mask32 = 0xffffffff;
+ 	struct ether_addr 	ether;
+ 
+ 	/* VirtualBOX */
-- 
cgit v1.2.3