Index: head/security/ipv6toolkit/Makefile =================================================================== --- head/security/ipv6toolkit/Makefile (revision 545977) +++ head/security/ipv6toolkit/Makefile (revision 545978) @@ -1,48 +1,50 @@ # $FreeBSD$ PORTNAME= ipv6toolkit PORTVERSION= 2.0 DISTVERSIONPREFIX= v CATEGORIES= security MASTER_SITES= http://www.si6networks.com/tools/ipv6toolkit/ MAINTAINER= hrs@FreeBSD.org COMMENT= Set of IPv6 security assessment tools LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE.TXT USES= shebangfix uidfix SHEBANG_FILES= tools/blackhole6 tools/script6 MAKE_ENV= DATADIR=${DATADIR} WRKSRC=${WRKSRC} SUB_FILES= BSDMakefile Makefile Makefile.lib MAKEFILE= BSDMakefile PORTDOCS= README.TXT CHANGES.TXT CREDITS.TXT PROGDIRS= addr6 flow6 frag6 icmp6 jumbo6 na6 ni6 ns6 path6 ra6 rd6 rs6 \ scan6 tcp6 udp6 LIBDIRS= libipv6 OPTIONS_DEFINE= DOCS post-extract: @cd ${WRKSRC} && ${MKDIR} ${PROGDIRS} ${LIBDIRS} post-patch: apply-slist - @${INSTALL_DATA} ${WRKDIR}/BSDMakefile ${WRKSRC} - @for D in ${PROGDIRS}; do \ + ${INSTALL_DATA} ${WRKDIR}/BSDMakefile ${WRKSRC} + for D in ${PROGDIRS}; do \ ${INSTALL_DATA} ${WRKDIR}/Makefile ${WRKSRC}/$$D; \ done - @for D in ${LIBDIRS}; do \ + for D in ${LIBDIRS}; do \ ${INSTALL_DATA} ${WRKDIR}/Makefile.lib ${WRKSRC}/$$D/Makefile; \ done post-install: ${INSTALL_SCRIPT} ${WRKSRC}/tools/blackhole6 ${WRKSRC}/tools/script6 \ ${STAGEDIR}${PREFIX}/sbin +pre-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include Index: head/security/ipv6toolkit/files/patch-tools-flow6.c =================================================================== --- head/security/ipv6toolkit/files/patch-tools-flow6.c (nonexistent) +++ head/security/ipv6toolkit/files/patch-tools-flow6.c (revision 545978) @@ -0,0 +1,11 @@ +--- tools/flow6.c.orig 2015-04-05 14:00:06 UTC ++++ tools/flow6.c +@@ -86,7 +86,7 @@ unsigned int pktbytes; + bpf_u_int32 my_netmask; + bpf_u_int32 my_ip; + struct bpf_program pcap_filter; +-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; ++char dev[64]; + unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; + unsigned char *v6buffer, *ptr, *startofprefixes; + char *pref; Property changes on: head/security/ipv6toolkit/files/patch-tools-flow6.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/ipv6toolkit/files/patch-tools-libipv6.c =================================================================== --- head/security/ipv6toolkit/files/patch-tools-libipv6.c (nonexistent) +++ head/security/ipv6toolkit/files/patch-tools-libipv6.c (revision 545978) @@ -0,0 +1,13 @@ +--- tools/libipv6.c.orig 2015-04-05 14:01:29 UTC ++++ tools/libipv6.c +@@ -70,8 +70,8 @@ sigjmp_buf env; + unsigned int canjump; + + /* pcap variables */ +-char errbuf[PCAP_ERRBUF_SIZE]; +-struct bpf_program pcap_filter; ++static char errbuf[PCAP_ERRBUF_SIZE]; ++static struct bpf_program pcap_filter; + + #ifdef __linux__ + /* Netlink requests */ Property changes on: head/security/ipv6toolkit/files/patch-tools-libipv6.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/ipv6toolkit/files/patch-tools-scan6.c =================================================================== --- head/security/ipv6toolkit/files/patch-tools-scan6.c (revision 545977) +++ head/security/ipv6toolkit/files/patch-tools-scan6.c (revision 545978) @@ -1,16 +1,27 @@ --- tools/scan6.c.orig 2015-04-05 14:03:21 UTC +++ tools/scan6.c +@@ -251,8 +251,8 @@ uint16_t service_ports_dec[]={21, 22, 23, 25, 49, 5 + + + /* IPv6 Address Resolution */ +-sigjmp_buf env; +-unsigned int canjump; ++extern sigjmp_buf env; ++extern unsigned int canjump; + + int main(int argc, char **argv){ + extern char *optarg; @@ -1504,9 +1504,11 @@ int main(int argc, char **argv){ if(!pps_f && !bps_f) pktinterval= 1000; - +#ifndef IPV6TOOLKITCONF +#define IPV6TOOLKITCONF "/etc/ipv6toolkit.conf" +#endif if(!configfile_f){ - strncpy(configfile, "/etc/ipv6toolkit.conf", MAX_FILENAME_SIZE); + strncpy(configfile, IPV6TOOLKITCONF, MAX_FILENAME_SIZE); } if(tgt_vendor_f || portscan_f){