- update to v2.1a11

- move examples configuration into $PREFIX/share/examples/arpwatch - move database to /var/arpwatch, create if needed - update manpages to reflect new paths - take MAINTAINER
2001-06-01 23:36:31 +00:00 · 2001-06-01 23:36:31 +00:00 · 63f99d9779
commit 63f99d9779
parent dcc5e63c1b
7 changed files with 112 additions and 29 deletions
--- a/net/arpwatch/Makefile
+++ b/net/arpwatch/Makefile
@ -1,32 +1,36 @@
-# $OpenBSD: Makefile,v 1.13 2001/05/06 04:59:55 lebel Exp $
+# $OpenBSD: Makefile,v 1.14 2001/06/01 23:36:31 jakob Exp $

 COMMENT=	"monitor arp & rarp requests"

-DISTNAME=	arpwatch-2.1a10
+DISTNAME=	arpwatch-2.1a11
 CATEGORIES=	net
 NEED_VERSION=	1.402
 MASTER_SITES=	http://www.Awfulhak.org/arpwatch/ \
 		ftp://ftp.ee.lbl.gov/ \
 		ftp://ftp.cso.uiuc.edu/pub/security/coast/unix/arpwatch/

-MAINTAINER=	ports@openbsd.org
+MAINTAINER=	Jakob Schlyter <jakob@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=	--quiet
-INSTALL_TARGET=	install install-man
+CONFIGURE_STYLE=	gnu
+CONFIGURE_ARGS=		--quiet
+MAKE_FLAGS+=		ARPDIR=/var/arpwatch

-post-install:
-	${STRIP} ${PREFIX}/sbin/arpwatch
-	${STRIP} ${PREFIX}/sbin/arpsnmp
-	${INSTALL_DATA_DIR} ${PREFIX}/arpwatch
-	@for i in arp.dat ethercodes.dat d.awk e.awk p.awk; do \
-		${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/arpwatch; \
+EXAMPLESDIR=	${PREFIX}/share/examples/arpwatch
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/arpwatch ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/arpsnmp ${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/arpwatch.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/arpsnmp.8 ${PREFIX}/man/man8
+	${INSTALL_DATA_DIR} ${EXAMPLESDIR}
+	@for i in ethercodes.dat d.awk e.awk p.awk; do \
+		${INSTALL_DATA} ${WRKSRC}/$$i ${EXAMPLESDIR}; \
 	done
-	@${INSTALL_SCRIPT} ${WRKSRC}/arp2ethers ${PREFIX}/arpwatch
+	@${INSTALL_SCRIPT} ${WRKSRC}/arp2ethers ${EXAMPLESDIR}

 .include <bsd.port.mk>
--- a/net/arpwatch/files/md5
+++ b/net/arpwatch/files/md5
@ -1,3 +1,3 @@
-MD5 (arpwatch-2.1a10.tar.gz) = c3f82f51f0c0bfcaf72b5fb216ab6a7b
-RMD160 (arpwatch-2.1a10.tar.gz) = 852b4cbfee3987dd749b4a32b00fb92638950206
-SHA1 (arpwatch-2.1a10.tar.gz) = 4d1d161e2ca5122064b75b35d2bfcafc6798607d
+MD5 (arpwatch-2.1a11.tar.gz) = 9ecd00db892737431b0e524f3e52e19e
+RMD160 (arpwatch-2.1a11.tar.gz) = e5932b488fbbe34926525e2795f31d2e8b3974dc
+SHA1 (arpwatch-2.1a11.tar.gz) = d14f9218928885ea9b502461259513a815809be7
--- a/net/arpwatch/patches/patch-arpsnmp.8
+++ b/net/arpwatch/patches/patch-arpsnmp.8
@ -0,0 +1,13 @@
+$OpenBSD: patch-arpsnmp.8,v 1.1 2001/06/01 23:36:32 jakob Exp $
+
+--- arpsnmp.8.orig	Sat Jun  2 01:22:29 2001
+++ arpsnmp.8	Sat Jun  2 01:22:41 2001
+@@ -69,7 +69,7 @@ man page for details on the report messa
+ .na
+ .nh
+ .nf
+-/usr/operator/arpwatch - default directory
+/var/arpwatch - default directory
+ arp.dat - ethernet/ip address database
+ ethercodes.dat - vendor ethernet block list
+ .ad
--- a/net/arpwatch/patches/patch-arpwatch.8
+++ b/net/arpwatch/patches/patch-arpwatch.8
@ -0,0 +1,13 @@
+$OpenBSD: patch-arpwatch.8,v 1.1 2001/06/01 23:36:32 jakob Exp $
+
+--- arpwatch.8.orig	Sat Jun  2 01:22:23 2001
+++ arpwatch.8	Sat Jun  2 01:22:47 2001
+@@ -152,7 +152,7 @@ addresses was a DECnet address.
+ .na
+ .nh
+ .nf
+-/usr/operator/arpwatch - default directory
+/var/arpwatch - default directory
+ arp.dat - ethernet/ip address database
+ ethercodes.dat - vendor ethernet block list
+ .ad
--- a/net/arpwatch/patches/patch-no_ip
+++ b/net/arpwatch/patches/patch-no_ip
@ -1,10 +1,10 @@
-$OpenBSD: patch-no_ip,v 1.2 2000/12/19 12:12:41 camield Exp $
+$OpenBSD: patch-no_ip,v 1.3 2001/06/01 23:36:32 jakob Exp $

 Do not bail if the interface does not have an IP assigned.

 --- arpwatch.c.orig	Sat Oct 14 04:07:35 2000
-+++ arpwatch.c	Tue Dec 19 11:38:16 2000
-@@ -223,9 +223,11 @@
+++ arpwatch.c	Sat Jun  2 01:22:14 2001
+@@ -223,9 +223,11 @@ main(int argc, char **argv)
 
 		/* Determine network and netmask */
 		if (pcap_lookupnet(interface, &net, &netmask, errbuf) < 0) {
--- a/net/arpwatch/pkg/INSTALL
+++ b/net/arpwatch/pkg/INSTALL
@ -0,0 +1,56 @@
+#!/bin/sh
+#
+# $OpenBSD: INSTALL,v 1.1 2001/06/01 23:36:32 jakob Exp $
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+CONFIG_DIR=/var/arpwatch
+SAMPLE_CONFIG_DIR=$PREFIX/share/examples/arpwatch
+
+
+do_configs()
+{
+    if [ -d $CONFIG_DIR ]; then
+	echo ""
+	echo "+---------------"
+	echo "| The existing $1 configuration files in $CONFIG_DIR,"
+	echo "| have NOT been changed.  You may want to compare them to the"
+	echo "| current sample files, $SAMPLE_CONFIG_DIR,"
+	echo "| and update your configuration as needed."
+    	echo "+---------------"
+	echo ""
+    else
+	install -d -o root -g wheel -m 755 $CONFIG_DIR
+	install -o root -g wheel -m 444 \
+	    $SAMPLE_CONFIG_DIR/ethercodes.dat $CONFIG_DIR
+	install -o root -g wheel -m 644 \
+	    /dev/null $CONFIG_DIR/arp.dat
+
+	echo ""
+	echo "+---------------"
+	echo "| The $1 configuration files in $CONFIG_DIR,"
+	echo "| have been installed.  Please view these files and change"
+	echo "| the configuration to meet your needs."
+	echo "+---------------"
+	echo ""
+    fi
+}
+
+if [ $# -ne 2 ]; then
+    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+    exit 1
+fi
+
+case $2 in
+    PRE-INSTALL)
+	;;
+    POST-INSTALL)
+	do_configs $1
+	;;
+    *)
+	echo "Usage: `basename $0` distname <PRE-INSTALL|POST-INSTALL>" >&2
+	exit 1
+	;;
+esac
+
+exit 0
--- a/net/arpwatch/pkg/PLIST
+++ b/net/arpwatch/pkg/PLIST
@ -1,14 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.5 2000/12/19 12:12:43 camield Exp $
+@comment $OpenBSD: PLIST,v 1.6 2001/06/01 23:36:32 jakob Exp $
 sbin/arpwatch
 sbin/arpsnmp
 man/man8/arpwatch.8
 man/man8/arpsnmp.8
-@mode 0644
-arpwatch/arp.dat
-@mode
-arpwatch/arp2ethers
-arpwatch/ethercodes.dat
-arpwatch/d.awk
-arpwatch/e.awk
-arpwatch/p.awk
-@dirrm arpwatch
+share/examples/arpwatch/arp2ethers
+share/examples/arpwatch/ethercodes.dat
+share/examples/arpwatch/d.awk
+share/examples/arpwatch/e.awk
+share/examples/arpwatch/p.awk
+@dirrm share/examples/arpwatch