Date: Sat, 16 Feb 2013 22:27:20 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312388 - in head/security/ipv6toolkit: . files Message-ID: <201302162227.r1GMRKZt062189@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Sat Feb 16 22:27:20 2013 New Revision: 312388 URL: http://svnweb.freebsd.org/changeset/ports/312388 Log: Update to 1.3. Added: head/security/ipv6toolkit/files/patch-data-ipv6toolkit.conf (contents, props changed) head/security/ipv6toolkit/files/patch-tools-scan6.c (contents, props changed) Deleted: head/security/ipv6toolkit/files/patch-manuals-Makefile head/security/ipv6toolkit/files/patch-tools-Makefile Modified: head/security/ipv6toolkit/Makefile head/security/ipv6toolkit/distinfo head/security/ipv6toolkit/files/patch-Makefile head/security/ipv6toolkit/pkg-descr head/security/ipv6toolkit/pkg-plist Modified: head/security/ipv6toolkit/Makefile ============================================================================== --- head/security/ipv6toolkit/Makefile Sat Feb 16 21:36:00 2013 (r312387) +++ head/security/ipv6toolkit/Makefile Sat Feb 16 22:27:20 2013 (r312388) @@ -1,14 +1,9 @@ -# Ports collection makefile for: ipv6toolkit -# Date created: Mon, July 16, 2012 -# Whom: hrs -# # $FreeBSD$ -# PORTNAME= ipv6toolkit -PORTVERSION= 1.2.3 +PORTVERSION= 1.3 CATEGORIES= security ipv6 -MASTER_SITES= http://www.si6networks.com/research/ +MASTER_SITES= http://www.si6networks.com/tools/ipv6toolkit/ DISTNAME= ipv6-toolkit-v${PORTVERSION} MAINTAINER= hrs@FreeBSD.org @@ -16,19 +11,20 @@ COMMENT= A set of IPv6 security assessme LICENSE= GPLv3 -.if !defined(NOPORTDOCS) -MAKE_ENV= WITH_DOCS= -MAN1= scan6.1 -.endif - -PORTDOCS= README.TXT flow6-manual.pdf frag6-manual.pdf \ - icmp6-manual.pdf jumbo6-manual.pdf na6-manual.pdf \ - ni6-manual.pdf ns6-manual.pdf ra6-manual.pdf \ - rd6-manual.pdf rs6-manual.pdf scan6-manual.pdf \ - tcp6-manual.pdf +MAKE_ENV= DATADIR=${DATADIR} +MAKE_JOBS_SAFE= yes +PORTDOCS= README.TXT +MAN1= flow6.1 frag6.1 icmp6.1 jumbos6.1 na6.1 ni6.1 ns6.1 ra6.1 \ + rd6.1 rs6.1 scan6.1 tcp6.1 +MAN5= ipv6toolkit.conf.5 + +post-patch: + ${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},' \ + ${WRKSRC}/data/ipv6toolkit.conf .if !defined(NOPORTDOCS) post-install: + @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.TXT ${DOCSDIR} .endif Modified: head/security/ipv6toolkit/distinfo ============================================================================== --- head/security/ipv6toolkit/distinfo Sat Feb 16 21:36:00 2013 (r312387) +++ head/security/ipv6toolkit/distinfo Sat Feb 16 22:27:20 2013 (r312388) @@ -1,2 +1,2 @@ -SHA256 (ipv6-toolkit-v1.2.3.tar.gz) = 37fde545740ff58ff27a5cb9590cb1aef36206d163471d31c5f7531f501e90c5 -SIZE (ipv6-toolkit-v1.2.3.tar.gz) = 1407650 +SHA256 (ipv6-toolkit-v1.3.tar.gz) = d45bb9cec9ea3a65416c153eb03cdb93d85437e1b802a0ed05f19b886700843c +SIZE (ipv6-toolkit-v1.3.tar.gz) = 2918536 Modified: head/security/ipv6toolkit/files/patch-Makefile ============================================================================== --- head/security/ipv6toolkit/files/patch-Makefile Sat Feb 16 21:36:00 2013 (r312387) +++ head/security/ipv6toolkit/files/patch-Makefile Sat Feb 16 22:27:20 2013 (r312388) @@ -1,11 +1,47 @@ ---- /dev/null 2012-07-17 03:01:43.000000000 +0900 -+++ Makefile 2012-07-17 03:02:23.000000000 +0900 -@@ -0,0 +1,8 @@ +--- Makefile.orig 2013-02-16 18:15:13.000000000 +0900 ++++ Makefile 2013-02-17 07:19:34.000000000 +0900 +@@ -1,12 +1,14 @@ +# $FreeBSD$ + -+SUBDIR= tools -+.if defined(WITH_DOCS) -+SUBDIR+= manuals -+.endif -+ -+.include <bsd.subdir.mk> + # + # SI6 Networks' IPv6 toolkit Makefile + # +-CC= gcc +-CFLAGS= -Wall ++CC?= gcc ++CFLAGS+= -Wall -DIPV6TOOLKITCONF=\"${PREFIX}/etc/ipv6toolkit.conf\" + LDFLAGS+= -lpcap -lm +-MANPATH= /usr/share/man +-DATAPATH= /usr/share +-BINPATH= /usr/bin ++MANPATH= ${MANPREFIX}/man ++DATAPATH= ${DATADIR} ++BINPATH= ${PREFIX}/bin + SRCPATH= tools + TOOLS= flow6 frag6 icmp6 jumbo6 na6 ni6 ns6 ra6 rd6 rs6 scan6 tcp6 + +@@ -54,18 +56,18 @@ + install: all + # Install the binaries + install -m0755 -d $(BINPATH) +- install -m0755 $(TOOLS) $(BINPATH) ++ ${BSD_INSTALL_PROGRAM} $(TOOLS) $(BINPATH) + + # Install the configuration file +- install -m0644 data/ipv6toolkit.conf /etc ++ ${BSD_INSTALL_DATA} data/ipv6toolkit.conf ${PREFIX}/etc + + # Install the IEEE OUI database +- install -m0755 -d $(DATAPATH)/ipv6toolkit +- install -m0644 data/oui.txt $(DATAPATH)/ipv6toolkit ++ install -m0755 -d $(DATAPATH) ++ ${BSD_INSTALL_DATA} -m0644 data/oui.txt $(DATAPATH) + + # Install the manual pages + install -m0755 -d $(MANPATH)/man1 +- install -m0644 manuals/*.1 $(MANPATH)/man1 ++ ${BSD_INSTALL_MAN} manuals/*.1 $(MANPATH)/man1 + install -m0755 -d $(MANPATH)/man5 +- install -m0644 manuals/*.5 $(MANPATH)/man1 ++ ${BSD_INSTALL_MAN} -m0644 manuals/*.5 $(MANPATH)/man5 + Added: head/security/ipv6toolkit/files/patch-data-ipv6toolkit.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/ipv6toolkit/files/patch-data-ipv6toolkit.conf Sat Feb 16 22:27:20 2013 (r312388) @@ -0,0 +1,8 @@ +--- data/ipv6toolkit.conf.orig 2013-02-17 07:14:44.000000000 +0900 ++++ data/ipv6toolkit.conf 2013-02-17 07:15:00.000000000 +0900 +@@ -1,4 +1,4 @@ + # SI6 Networks IPv6 Toolkit Configuration File + +-OUI-Database=/usr/share/ipv6toolkit/oui.txt ++OUI-Database=%%DATADIR%%/oui.txt + Added: head/security/ipv6toolkit/files/patch-tools-scan6.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/ipv6toolkit/files/patch-tools-scan6.c Sat Feb 16 22:27:20 2013 (r312388) @@ -0,0 +1,16 @@ +--- tools/scan6.c.orig 2013-02-17 06:55:02.000000000 +0900 ++++ tools/scan6.c 2013-02-17 06:56:04.000000000 +0900 +@@ -969,9 +969,11 @@ + 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){ Modified: head/security/ipv6toolkit/pkg-descr ============================================================================== --- head/security/ipv6toolkit/pkg-descr Sat Feb 16 21:36:00 2013 (r312387) +++ head/security/ipv6toolkit/pkg-descr Sat Feb 16 22:27:20 2013 (r312388) @@ -1,4 +1,4 @@ The IPv6 toolkit is a portable IPv6 security assessment suite produced by Fernando Gont on behalf of the UK CPNI. -WWW: http://www.si6networks.com/research/tools.html +WWW: http://www.si6networks.com/tools/ipv6toolkit/ Modified: head/security/ipv6toolkit/pkg-plist ============================================================================== --- head/security/ipv6toolkit/pkg-plist Sat Feb 16 21:36:00 2013 (r312387) +++ head/security/ipv6toolkit/pkg-plist Sat Feb 16 22:27:20 2013 (r312388) @@ -11,3 +11,6 @@ bin/rd6 bin/rs6 bin/scan6 bin/tcp6 +etc/ipv6toolkit.conf +%%DATADIR%%/oui.txt +@dirrm %%DATADIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302162227.r1GMRKZt062189>