fix -u in arp-scan's update scripts, fix URLs, use newer iab/oui databases

net/arp-scan/Makefile

@@ -1,14 +1,17 @@
-# $OpenBSD: Makefile,v 1.7 2011/11/15 23:02:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2012/05/08 11:04:27 sthen Exp $
 
 COMMENT =	ARP scanning and fingerprinting tool
 DISTNAME =	arp-scan-1.8
-REVISION =	0
+REVISION =	1
 CATEGORIES =	net
 
 HOMEPAGE =	http://www.nta-monitor.com/tools/arp-scan/
 MAINTAINER =	Stuart Henderson <sthen@openbsd.org>
 
 MASTER_SITES =	${HOMEPAGE}download/
+MASTER_SITES0 =	http://spacehopper.org/mirrors/
+DISTFILES =	${DISTNAME}${EXTRACT_SUFX} \
+		oui-iab-20120508.tar.bz2:0
 
 # GPLv3+
 PERMIT_DISTFILES_CDROM =Yes
@@ -21,7 +24,25 @@ WANTLIB =		c pcap
 CONFIGURE_STYLE =	gnu
 USE_GROFF =		Yes
 
+pre-configure:
+	cd ${WRKSRC} && \
+	    ./get-iab -f ieee-iab.txt -u file://${WRKDIR}/oui-iab/iab.txt && \
+	    ./get-oui -f ieee-oui.txt -u file://${WRKDIR}/oui-iab/oui.txt
+
 post-install:
 	cd ${PREFIX}/share/arp-scan; mv mac-vendor.txt mac-vendor.txt.dist
 
+# maintainer convenience target
+listing:
+	t=`mktemp -d /tmp/oui-iab.XXXXXXXXXX`; \
+	    f=oui-iab-`date +%Y%m%d`.tar.bz2; \
+	    cd $$t; \
+	    mkdir oui-iab; \
+	    cd oui-iab; \
+	    ftp http://standards.ieee.org/develop/regauth/iab/iab.txt; \
+	    ftp http://standards.ieee.org/develop/regauth/oui/oui.txt; \
+	    cd ..; \
+	    tar cjf $$f oui-iab; \
+	    scp $$f naiad:mirrors/
+
 .include <bsd.port.mk>

net/arp-scan/distinfo

@@ -1,5 +1,10 @@
 MD5 (arp-scan-1.8.tar.gz) = vogmV07FZiF+t8oED+Ry+Q==
+MD5 (oui-iab-20120508.tar.bz2) = iqHam7+FJXSjPEgX/VLNww==
 RMD160 (arp-scan-1.8.tar.gz) = LPYNqZjNi/SXZ5OBh0Jvg7oFgvE=
+RMD160 (oui-iab-20120508.tar.bz2) = KsmcAl3RclAvMXjvHrkBY5XCOFQ=
 SHA1 (arp-scan-1.8.tar.gz) = Juvxjv82eq+ZMHhBvsnoueWWw7s=
+SHA1 (oui-iab-20120508.tar.bz2) = zsmw7umBEqSY/39nksDUb2AL5iw=
 SHA256 (arp-scan-1.8.tar.gz) = Pk0t2wY02tB8vnIGNJ4Os4njdRCIOwc1pFCt70HfbyY=
+SHA256 (oui-iab-20120508.tar.bz2) = /nzU3B8hywYDV95ZVTi3pSICQ8XCsR3pIzBaJ7xRzxA=
 SIZE (arp-scan-1.8.tar.gz) = 430221
+SIZE (oui-iab-20120508.tar.bz2) = 707476

net/arp-scan/patches/patch-get-iab

@@ -0,0 +1,21 @@
+$OpenBSD: patch-get-iab,v 1.1 2012/05/08 11:04:27 sthen Exp $
+--- get-iab.orig	Sun Jan  9 10:37:09 2011
++++ get-iab	Tue May  8 11:17:20 2012
+@@ -36,7 +36,7 @@ use strict;
+ use Getopt::Std;
+ use LWP::Simple;
+ #
+-my $default_url = 'http://standards.ieee.org/regauth/oui/iab.txt';
++my $default_url = 'http://standards.ieee.org/develop/regauth/iab/iab.txt';
+ my $default_filename='ieee-iab.txt';
+ #
+ my $usage =
+@@ -61,7 +61,7 @@ my $vendor;
+ #
+ # Process options
+ #
+-die "$usage\n" unless getopts('hf:v',\%opts);
++die "$usage\n" unless getopts('hf:u:v',\%opts);
+ if ($opts{h}) {
+    print "$usage\n";
+    exit(0);

net/arp-scan/patches/patch-get-oui

@@ -0,0 +1,21 @@
+$OpenBSD: patch-get-oui,v 1.1 2012/05/08 11:04:27 sthen Exp $
+--- get-oui.orig	Sun Jan  9 10:37:09 2011
++++ get-oui	Tue May  8 11:17:31 2012
+@@ -32,7 +32,7 @@ use strict;
+ use Getopt::Std;
+ use LWP::Simple;
+ #
+-my $default_url = 'http://standards.ieee.org/regauth/oui/oui.txt';
++my $default_url = 'http://standards.ieee.org/develop/regauth/oui/oui.txt';
+ my $default_filename='ieee-oui.txt';
+ #
+ my $usage =
+@@ -55,7 +55,7 @@ my $lineno = 0;
+ #
+ # Process options
+ #
+-die "$usage\n" unless getopts('hf:v',\%opts);
++die "$usage\n" unless getopts('hf:u:v',\%opts);
+ if ($opts{h}) {
+    print "$usage\n";
+    exit(0);

net/arp-scan/pkg/PLIST

@@ -1,4 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.2 2011/03/03 09:47:51 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.3 2012/05/08 11:04:27 sthen Exp $
+@extra ${TRUEPREFIX}/share/arp-scan/ieee-iab.txt.bak
+@extra ${TRUEPREFIX}/share/arp-scan/ieee-oui.txt.bak
 bin/arp-fingerprint
 @bin bin/arp-scan
 bin/get-iab