Update security/ipv6-toolkit to version 1.4.1 Changes since previous version: SI6 Networks' IPv6 Toolkit v1.4.1 * frag6: Fixed bug that prevented Ethernet header from being filled A bug in the code caused Ethernet frames to go on te wire without any of their header fields completed. * All: Use of library to avoid code replication An "libipv6" library was created, such that common functions do not need to be replicated for each tool. ni6, ns6, rs6, and tcp6 now employ such library. pkgsrc changes: * address6 and its man page are no longer installed * extend the Makefile changes to include the correct linkage for rs6 and tcp6 i.e. include the libipv6 object mentioned abovediff -r1.8 -r1.9 pkgsrc/security/ipv6-toolkit/Makefile
(agc)
@@ -1,32 +1,29 @@ | @@ -1,32 +1,29 @@ | |||
1 | # $NetBSD: Makefile,v 1.8 2013/08/31 19:14:47 agc Exp $ | 1 | # $NetBSD: Makefile,v 1.9 2013/09/09 06:42:44 agc Exp $ | |
2 | 2 | |||
3 | DISTNAME= ipv6toolkit-v1.4 | 3 | DISTNAME= ipv6toolkit-v1.4.1 | |
4 | PKGNAME= ${DISTNAME:C/-v/-/} | 4 | PKGNAME= ${DISTNAME:C/-v/-/} | |
5 | PKGREVISION= 1 | |||
6 | CATEGORIES= security net | 5 | CATEGORIES= security net | |
7 | MASTER_SITES= http://www.si6networks.com/tools/ipv6toolkit/ | 6 | MASTER_SITES= http://www.si6networks.com/tools/ipv6toolkit/ | |
8 | 7 | |||
9 | MAINTAINER= agc@NetBSD.org | 8 | MAINTAINER= agc@NetBSD.org | |
10 | HOMEPAGE= http://www.si6networks.com/tools/ipv6toolkit | 9 | HOMEPAGE= http://www.si6networks.com/tools/ipv6toolkit | |
11 | COMMENT= IPv6 security assessment and troubleshooting tool | 10 | COMMENT= IPv6 security assessment and troubleshooting tool | |
12 | LICENSE= gnu-gpl-v3 | 11 | LICENSE= gnu-gpl-v3 | |
13 | 12 | |||
14 | DIST_SUBDIR= ${PKGNAME_NOREV} | |||
15 | ||||
16 | AUTO_MKDIRS= yes | 13 | AUTO_MKDIRS= yes | |
17 | 14 | |||
18 | BINS= address6 flow6 frag6 icmp6 jumbo6 na6 ni6 ns6 ra6 rd6 rs6 scan6 tcp6 | 15 | BINS= flow6 frag6 icmp6 jumbo6 na6 ni6 ns6 ra6 rd6 rs6 scan6 tcp6 | |
19 | MAN1= address6.1 flow6.1 frag6.1 icmp6.1 jumbo6.1 na6.1 ni6.1 ns6.1 | 16 | MAN1= flow6.1 frag6.1 icmp6.1 jumbo6.1 na6.1 ni6.1 ns6.1 | |
20 | MAN1+= ra6.1 rd6.1 rs6.1 scan6.1 tcp6.1 | 17 | MAN1+= ra6.1 rd6.1 rs6.1 scan6.1 tcp6.1 | |
21 | MAN5= ipv6toolkit.conf.5 | 18 | MAN5= ipv6toolkit.conf.5 | |
22 | 19 | |||
23 | do-install: | 20 | do-install: | |
24 | for f in ${BINS}; do \ | 21 | for f in ${BINS}; do \ | |
25 | ${INSTALL_PROGRAM} ${WRKSRC}/$$f ${DESTDIR}${PREFIX}/bin/$$f; \ | 22 | ${INSTALL_PROGRAM} ${WRKSRC}/$$f ${DESTDIR}${PREFIX}/bin/$$f; \ | |
26 | done | 23 | done | |
27 | for f in ${MAN1}; do \ | 24 | for f in ${MAN1}; do \ | |
28 | ${INSTALL_MAN} ${WRKSRC}/manuals/$$f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/$$f; \ | 25 | ${INSTALL_MAN} ${WRKSRC}/manuals/$$f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/$$f; \ | |
29 | done | 26 | done | |
30 | for f in ${MAN5}; do \ | 27 | for f in ${MAN5}; do \ | |
31 | ${INSTALL_MAN} ${WRKSRC}/manuals/$$f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/$$f; \ | 28 | ${INSTALL_MAN} ${WRKSRC}/manuals/$$f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/$$f; \ | |
32 | done | 29 | done |
@@ -1,7 +1,7 @@ | @@ -1,7 +1,7 @@ | |||
1 | $NetBSD: distinfo,v 1.8 2013/08/31 19:14:47 agc Exp $ | 1 | $NetBSD: distinfo,v 1.9 2013/09/09 06:42:44 agc Exp $ | |
2 | 2 | |||
3 | SHA1 (ipv6toolkit-1.4/ipv6toolkit-v1.4.tar.gz) = 08648022a9b026ab5adcf1de173d26e56e202d62 | 3 | SHA1 (ipv6toolkit-v1.4.1.tar.gz) = 09a90562c7cfe5849b11479daadc5416b03effc6 | |
4 | RMD160 (ipv6toolkit-1.4/ipv6toolkit-v1.4.tar.gz) = 9e47985f6ed4b47a8269432fb46fca32baddd501 | 4 | RMD160 (ipv6toolkit-v1.4.1.tar.gz) = 43ff67290223a79e5cd58a5dd5801dc52f0ae245 | |
5 | Size (ipv6toolkit-1.4/ipv6toolkit-v1.4.tar.gz) = 481666 bytes | 5 | Size (ipv6toolkit-v1.4.1.tar.gz) = 469374 bytes | |
6 | SHA1 (patch-Makefile) = 217b9e8cf7b8478773bbc7ee8971d1fccfde2909 | 6 | SHA1 (patch-Makefile) = f8471f18a7fb1604357a9a4e55808e1c1f9c8f94 | |
7 | SHA1 (patch-aa) = 594fb41b77258cae0d3ba81a78144c312728faa8 | 7 | SHA1 (patch-aa) = 594fb41b77258cae0d3ba81a78144c312728faa8 |
@@ -1,28 +1,26 @@ | @@ -1,28 +1,26 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.2 2013/04/18 04:23:17 agc Exp $ | 1 | @comment $NetBSD: PLIST,v 1.3 2013/09/09 06:42:44 agc Exp $ | |
2 | bin/address6 | |||
3 | bin/flow6 | 2 | bin/flow6 | |
4 | bin/frag6 | 3 | bin/frag6 | |
5 | bin/icmp6 | 4 | bin/icmp6 | |
6 | bin/jumbo6 | 5 | bin/jumbo6 | |
7 | bin/na6 | 6 | bin/na6 | |
8 | bin/ni6 | 7 | bin/ni6 | |
9 | bin/ns6 | 8 | bin/ns6 | |
10 | bin/ra6 | 9 | bin/ra6 | |
11 | bin/rd6 | 10 | bin/rd6 | |
12 | bin/rs6 | 11 | bin/rs6 | |
13 | bin/scan6 | 12 | bin/scan6 | |
14 | bin/tcp6 | 13 | bin/tcp6 | |
15 | man/man1/address6.1 | |||
16 | man/man1/flow6.1 | 14 | man/man1/flow6.1 | |
17 | man/man1/frag6.1 | 15 | man/man1/frag6.1 | |
18 | man/man1/icmp6.1 | 16 | man/man1/icmp6.1 | |
19 | man/man1/jumbo6.1 | 17 | man/man1/jumbo6.1 | |
20 | man/man1/na6.1 | 18 | man/man1/na6.1 | |
21 | man/man1/ni6.1 | 19 | man/man1/ni6.1 | |
22 | man/man1/ns6.1 | 20 | man/man1/ns6.1 | |
23 | man/man1/ra6.1 | 21 | man/man1/ra6.1 | |
24 | man/man1/rd6.1 | 22 | man/man1/rd6.1 | |
25 | man/man1/rs6.1 | 23 | man/man1/rs6.1 | |
26 | man/man1/scan6.1 | 24 | man/man1/scan6.1 | |
27 | man/man1/tcp6.1 | 25 | man/man1/tcp6.1 | |
28 | man/man5/ipv6toolkit.conf.5 | 26 | man/man5/ipv6toolkit.conf.5 |
@@ -1,15 +1,34 @@ | @@ -1,15 +1,34 @@ | |||
1 | $NetBSD: patch-Makefile,v 1.2 2013/08/24 16:12:24 agc Exp $ | 1 | $NetBSD: patch-Makefile,v 1.3 2013/09/09 06:42:45 agc Exp $ | |
2 | 2 | |||
3 | Take ${CC} from environment | 3 | Take ${CC} from environment | |
4 | 4 | |||
5 | --- Makefile 2013/05/11 20:47:52 1.1 | 5 | --- Makefile 2013/05/11 20:47:52 1.1 | |
6 | +++ Makefile 2013/05/11 20:48:02 | 6 | +++ Makefile 2013/05/11 20:48:02 | |
7 | @@ -18,7 +18,7 @@ | 7 | @@ -18,7 +18,7 @@ | |
8 | # typically employed by package developers. | 8 | # typically employed by package developers. | |
9 | 9 | |||
10 | 10 | |||
11 | -CC= gcc | 11 | -CC= gcc | |
12 | +CC?= gcc | 12 | +CC?= gcc | |
13 | CFLAGS+= -Wall | 13 | CFLAGS+= -Wall | |
14 | LDFLAGS+= -lpcap -lm | 14 | LDFLAGS+= -lpcap -lm | |
15 | 15 | |||
16 | @@ -78,14 +78,14 @@ | |||
17 | rd6: $(SRCPATH)/rd6.c $(SRCPATH)/rd6.h $(SRCPATH)/ipv6toolkit.h | |||
18 | $(CC) $(CPPFLAGS) $(CFLAGS) -o rd6 $(SRCPATH)/rd6.c $(LDFLAGS) | |||
19 | ||||
20 | -rs6: $(SRCPATH)/rs6.c $(SRCPATH)/rs6.h $(SRCPATH)/ipv6toolkit.h | |||
21 | - $(CC) $(CPPFLAGS) $(CFLAGS) -o rs6 $(SRCPATH)/rs6.c $(LDFLAGS) | |||
22 | +rs6: $(SRCPATH)/rs6.c $(SRCPATH)/rs6.h $(LIBS) $(SRCPATH)/ipv6toolkit.h | |||
23 | + $(CC) $(CPPFLAGS) $(CFLAGS) -o rs6 $(SRCPATH)/rs6.c $(LIBS) $(LDFLAGS) | |||
24 | ||||
25 | scan6: $(SRCPATH)/scan6.c $(SRCPATH)/scan6.h $(SRCPATH)/ipv6toolkit.h | |||
26 | $(CC) $(CPPFLAGS) $(CFLAGS) -o scan6 $(SRCPATH)/scan6.c $(LDFLAGS) | |||
27 | ||||
28 | -tcp6: $(SRCPATH)/tcp6.c $(SRCPATH)/tcp6.h $(SRCPATH)/ipv6toolkit.h | |||
29 | - $(CC) $(CPPFLAGS) $(CFLAGS) -o tcp6 $(SRCPATH)/tcp6.c $(LDFLAGS) | |||
30 | +tcp6: $(SRCPATH)/tcp6.c $(SRCPATH)/tcp6.h $(LIBS) $(SRCPATH)/ipv6toolkit.h | |||
31 | + $(CC) $(CPPFLAGS) $(CFLAGS) -o tcp6 $(SRCPATH)/tcp6.c $(LIBS) $(LDFLAGS) | |||
32 | ||||
33 | libipv6.o: $(SRCPATH)/libipv6.c $(SRCPATH)/libipv6.h | |||
34 | $(CC) $(CPPFLAGS) $(CFLAGS) -c -o libipv6.o $(SRCPATH)/libipv6.c |