Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 6 Apr 2020 01:00:11 +0000 (UTC)
From:      Craig Leres <leres@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r530851 - in head/net-mgmt/arpwatch: . files
Message-ID:  <202004060100.03610B6o089612@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: leres
Date: Mon Apr  6 01:00:11 2020
New Revision: 530851
URL: https://svnweb.freebsd.org/changeset/ports/530851

Log:
  net-mgmt/arpwatch: Update to 3.1. Remove ETHERCODES option and add
  some pkg-message explaining how to use the new update-ethercodes
  script. Remove obsolete patches. Changes since 3.0:
  
  - Fix the FreeBSD rc.d script to handle interface names with . in
    them. Reported by Daniel Duerr.
  
  - Add python 2 compatibility to massagevendor (for pfsense <= 2.4.4).
  
  - Stop distributing ethercodes.dat and add update-ethercodes.sh to
    download and generate it.

Deleted:
  head/net-mgmt/arpwatch/files/patch-arpwatch.sh.in
  head/net-mgmt/arpwatch/files/patch-massagevendor.py.in
Modified:
  head/net-mgmt/arpwatch/Makefile
  head/net-mgmt/arpwatch/distinfo
  head/net-mgmt/arpwatch/files/pkg-message.in
  head/net-mgmt/arpwatch/pkg-plist

Modified: head/net-mgmt/arpwatch/Makefile
==============================================================================
--- head/net-mgmt/arpwatch/Makefile	Mon Apr  6 00:27:15 2020	(r530850)
+++ head/net-mgmt/arpwatch/Makefile	Mon Apr  6 01:00:11 2020	(r530851)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	arpwatch
-PORTVERSION=	3.0
-PORTREVISION=	3
+PORTVERSION=	3.1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://ee.lbl.gov/downloads/arpwatch/ \
 		LOCAL/leres/arpwatch
@@ -22,11 +21,10 @@ GNU_CONFIGURE=	yes
 
 SUB_FILES=      pkg-message
 
-OPTIONS_DEFINE=	DEBUG ETHERCODES ZEROPAD
-OPTIONS_DEFAULT=ETHERCODES ZEROPAD
+OPTIONS_DEFINE=	DEBUG ZEROPAD
+OPTIONS_DEFAULT=ZEROPAD
 OPTIONS_SUB=	yes
 
-ETHERCODES_DESC=install ethercodes.dat
 ZEROPAD_DESC=	zero pad displayed ethernet addresses by default
 
 .include <bsd.port.options.mk>
@@ -51,9 +49,8 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/arp2ethers ${STAGEDIR}${PREFIX}/arpwatch
 	${INSTALL_SCRIPT} ${WRKSRC}/massagevendor.py \
 	    ${STAGEDIR}${PREFIX}/arpwatch/massagevendor
-.if ${PORT_OPTIONS:METHERCODES}
-	${INSTALL_DATA} ${WRKSRC}/ethercodes.dat ${STAGEDIR}${PREFIX}/arpwatch
-.endif
+	${INSTALL_SCRIPT} ${WRKSRC}/update-ethercodes.sh \
+	    ${STAGEDIR}${PREFIX}/arpwatch/update-ethercodes
 
 post-configure:
 	${REINPLACE_CMD} -e "/^LIBS *=/s,-lpcap,${LOCALBASE}/lib/libpcap.so.1," \

Modified: head/net-mgmt/arpwatch/distinfo
==============================================================================
--- head/net-mgmt/arpwatch/distinfo	Mon Apr  6 00:27:15 2020	(r530850)
+++ head/net-mgmt/arpwatch/distinfo	Mon Apr  6 01:00:11 2020	(r530851)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575239752
-SHA256 (arpwatch-3.0.tar.gz) = 82e137e104aca8b1280f5cca0ebe61b978f10eadcbb4c4802c181522ad02b25b
-SIZE (arpwatch-3.0.tar.gz) = 407879
+TIMESTAMP = 1586134129
+SHA256 (arpwatch-3.1.tar.gz) = ee1d15d9a07952c0c017908b9dbfd5ac988fed0058c3cc4fa6c13e0be36f3a9f
+SIZE (arpwatch-3.1.tar.gz) = 117196

Modified: head/net-mgmt/arpwatch/files/pkg-message.in
==============================================================================
--- head/net-mgmt/arpwatch/files/pkg-message.in	Mon Apr  6 00:27:15 2020	(r530850)
+++ head/net-mgmt/arpwatch/files/pkg-message.in	Mon Apr  6 01:00:11 2020	(r530851)
@@ -1,15 +1,13 @@
 [
 { type: install
   message: <<EOM
-You can update the ethercodes.dat file executing the following steps:
+You can create an ethercodes.dat file by running this script:
 
-    cd %%PREFIX%%/arpwatch
-    fetch http://standards-oui.ieee.org/oui/oui.csv
-    ./massagevendor oui.csv > ethercodes.dat
-    rm oui.csv
+    %%PREFIX%%/arpwatch/update-ethercodes
 
-You might also want to disable the ETHERCODES option when building
-to avoid clobbering ethercodes.dat on update or reinstall.
+Here's a example crontab entry to update it every night:
+
+    00 0 * * * root sleep `jot -r 1 0 600` ; %%PREFIX%%/arpwatch/update-ethercodes
 
 The -m flag is deprecated. If you are using the -m watcher flag,
 please switch to -w.

Modified: head/net-mgmt/arpwatch/pkg-plist
==============================================================================
--- head/net-mgmt/arpwatch/pkg-plist	Mon Apr  6 00:27:15 2020	(r530850)
+++ head/net-mgmt/arpwatch/pkg-plist	Mon Apr  6 01:00:11 2020	(r530851)
@@ -2,10 +2,10 @@ arpwatch/arp2ethers
 arpwatch/d.awk
 arpwatch/duplicates.awk
 arpwatch/e.awk
-%%ETHERCODES%%arpwatch/ethercodes.dat
 arpwatch/euppertolower.awk
 arpwatch/massagevendor
 arpwatch/p.awk
+arpwatch/update-ethercodes
 etc/rc.d/arpwatch
 man/man8/arpsnmp.8.gz
 man/man8/arpwatch.8.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004060100.03610B6o089612>