7 files changed, 153 insertions, 5 deletions
diff --git a/packages/arpwatch/arpwatch-2.1a13/.mtn2git_empty b/packages/arpwatch/arpwatch-2.1a13/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/arpwatch/arpwatch-2.1a13/.mtn2git_empty
diff --git a/packages/arpwatch/files/05debian_fhs.patch b/packages/arpwatch/arpwatch-2.1a13/05debian_fhs.patch
index 208c65108b..208c65108b 100644
--- a/packages/arpwatch/files/05debian_fhs.patch
+++ b/packages/arpwatch/arpwatch-2.1a13/05debian_fhs.patch
diff --git a/packages/arpwatch/arpwatch-2.1a15/.mtn2git_empty b/packages/arpwatch/arpwatch-2.1a15/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/arpwatch/arpwatch-2.1a15/.mtn2git_empty
diff --git a/packages/arpwatch/arpwatch-2.1a15/05debian_fhs.patch b/packages/arpwatch/arpwatch-2.1a15/05debian_fhs.patch
new file mode 100644
index 0000000000..c6cffb06c3
--- /dev/null
+++ b/packages/arpwatch/arpwatch-2.1a15/05debian_fhs.patch
@@ -0,0 +1,91 @@
+Index: arpwatch/Makefile.in
+diff -u arpwatch/Makefile.in:1.1.1.1 arpwatch/Makefile.in:1.1.1.1.10.1
+--- arpwatch/Makefile.in:1.1.1.1	Tue Apr 17 13:31:36 2001
++++ arpwatch/Makefile.in	Tue Apr 17 13:53:29 2001
+@@ -31,7 +31,8 @@
+ # Pathname of directory to install the man page
+ MANDEST = @mandir@
+ # Pathname of directory to install database file
+-ARPDIR = $(prefix)/arpwatch
++ARPDIR = /var/lib/arpwatch
++ETHERCODES = /usr/share/arpwatch/ethercodes.dat
+ 
+ # VPATH
+ srcdir = @srcdir@
+@@ -45,7 +46,8 @@
+ PROG = arpwatch
+ CCOPT = @V_CCOPT@
+ INCLS = -I. @V_INCLS@
+-DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\"
++DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\" \
++	-DETHERCODES=\"$(ETHERCODES)\"
+ 
+ # Standard CFLAGS
+ CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
+Index: arpwatch/arpsnmp.8
+diff -u arpwatch/arpsnmp.8:1.1.1.1 arpwatch/arpsnmp.8:1.1.1.1.10.1
+--- arpwatch/arpsnmp.8:1.1.1.1	Tue Apr 17 13:31:36 2001
++++ arpwatch/arpsnmp.8	Tue Apr 17 13:53:29 2001
+@@ -69,9 +69,9 @@
+ .na
+ .nh
+ .nf
+-/usr/operator/arpwatch - default directory
++/var/lib/arpwatch - default directory
+ arp.dat - ethernet/ip address database
+-ethercodes.dat - vendor ethernet block list
++/usr/share/arpwatch/ethercodes.dat - vendor ethernet block list
+ .ad
+ .hy
+ .fi
+Index: arpwatch/arpwatch.8
+diff -u arpwatch/arpwatch.8:1.1.1.1 arpwatch/arpwatch.8:1.1.1.1.10.1
+--- arpwatch/arpwatch.8:1.1.1.1	Tue Apr 17 13:31:36 2001
++++ arpwatch/arpwatch.8	Tue Apr 17 13:53:29 2001
+@@ -152,9 +152,9 @@
+ .na
+ .nh
+ .nf
+-/usr/operator/arpwatch - default directory
++/var/lib/arpwatch - default directory
+ arp.dat - ethernet/ip address database
+-ethercodes.dat - vendor ethernet block list
++/usr/share/arpwatch/ethercodes.dat - vendor ethernet block list
+ .ad
+ .hy
+ .fi
+Index: arpwatch/arpwatch.h
+diff -u arpwatch/arpwatch.h:1.1.1.1 arpwatch/arpwatch.h:1.1.1.1.10.1
+--- arpwatch/arpwatch.h:1.1.1.1	Tue Apr 17 13:31:36 2001
++++ arpwatch/arpwatch.h	Tue Apr 17 13:53:29 2001
+@@ -1,7 +1,7 @@
+ /* @(#) $Id: arpwatch.h,v 1.29 2000/09/30 23:40:49 leres Exp $ (LBL) */
+ 
+ #define ARPFILE "arp.dat"
+-#define ETHERCODES "ethercodes.dat"
++/* #define ETHERCODES "ethercodes.dat" */
+ #define CHECKPOINT (15*60)		/* Checkpoint time in seconds */
+ 
+ #define MEMCMP(a, b, n) memcmp((char *)a, (char *)b, n)
+Index: arpwatch/bihourly
+diff -u arpwatch/bihourly:1.1.1.1 arpwatch/bihourly:1.1.1.1.10.1
+--- arpwatch/bihourly.sh	2006/11/21 22:53:34	1.1
++++ arpwatch/bihourly.sh	2006/11/21 22:54:13
+@@ -6,7 +6,7 @@
+ PATH=${PATH}:/usr/local/sbin
+ export PATH
+ #
+-cd /usr/operator/arpwatch
++cd /usr/lib/arpwatch
+ #
+ list="`cat list`"
+ cname="`cat cname`"
+@@ -26,7 +26,7 @@
+ 
+ alist=""
+ for r in ${list}; do \
+-	./arpfetch ${r} ${cname} > ${r} 2> ${temp1}
++	arpfetch ${r} ${cname} > ${r} 2> ${temp1}
+ 	if [ -s ${temp1} ]; then
+ 		echo "arpfetch ${r} errors:"
+ 		xr=${d}/${r}.$$
diff --git a/packages/arpwatch/arpwatch_2.1a15.bb b/packages/arpwatch/arpwatch_2.1a15.bb
new file mode 100644
index 0000000000..74e667c510
--- /dev/null
+++ b/packages/arpwatch/arpwatch_2.1a15.bb
@@ -0,0 +1,58 @@
+DESCRIPTION = "Ethernet/FDDI station activity monitor"
+HOMEPAGE = "http://www-nrg.ee.lbl.gov/"
+SECTION = "network"
+LICENSE = "BSD"
+RRECOMMENDS = "arpwatch-data"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.ee.lbl.gov/arpwatch-${PV}.tar.gz \
+           file://05debian_fhs.patch;patch=1 \
+           file://06debian_manpages.patch;patch=1 \
+           file://init.d \
+           file://arpwatch.default \
+           file://arpwatch.conf \
+           file://ethercodes.dat \
+           file://make.patch;patch=1 \
+           file://volatiles.08_arpwatch"
+
+inherit autotools update-rc.d
+
+PACKAGES =+ "arpwatch-data"
+
+FILES_arpwatch-data = "${datadir}/arpwatch/ethercodes.dat"
+
+do_install() {
+        install -d ${D}${bindir} ${D}${sbindir} ${D}${mandir}/man8 \
+                ${D}${sysconfdir}/default \
+                ${D}${sysconfdir}/init.d \
+                ${D}${datadir}/arpwatch \
+                ${D}${sysconfdir}/default/volatiles
+        oe_runmake install DESTDIR=${D}
+        oe_runmake install-man DESTDIR=${D}
+        for i in arp2ethers arpfetch massagevendor; do
+          install -m 0755 ${S}/$i ${D}${sbindir}
+        done
+        install -m 0755 ${S}/bihourly.sh ${D}${sbindir}/bihourly
+        for i in arp2ethers arpfetch bihourly massagevendor; do
+          install -m 0644 ${S}/$i.8 ${D}${mandir}/man8
+        done
+        install -m 0755 ${WORKDIR}/init.d ${D}${sysconfdir}/init.d/arpwatch
+        install -m 0644 ${WORKDIR}/arpwatch.default ${D}${sysconfdir}/default/arpwatch
+        install -m 0644 ${WORKDIR}/arpwatch.conf ${D}${sysconfdir}
+        install -m 0644 ${WORKDIR}/ethercodes.dat ${D}${datadir}/arpwatch
+
+        # We need some /var directories
+        for i in 08_arpwatch; do
+          install -m 0644 ${WORKDIR}/volatiles.$i ${D}${sysconfdir}/default/volatiles/$i
+        done
+}
+
+pkg_postinst_${PN} () {
+        /etc/init.d/populate-volatile.sh update
+}
+
+CONFFILES_${PN} = "${sysconfdir}/default/arpwatch \
+                   ${sysconfdir}/arpwatch.conf"
+
+INITSCRIPT_NAME = "arpwatch"
+INITSCRIPT_PARAMS = "defaults 95 05"
diff --git a/packages/arpwatch/files/arpwatch.default b/packages/arpwatch/files/arpwatch.default
index b0a7d8f9ff..204dffff8e 100644
--- a/packages/arpwatch/files/arpwatch.default
+++ b/packages/arpwatch/files/arpwatch.default
@@ -1,7 +1,4 @@
 # Global options for arpwatch(8).
 
-# Debian: don't report bogons, don't use PROMISC.
-ARGS="-N -p"
-
-# Debian: run as `arpwatch' user.  Empty this to run as root.
-RUNAS="arpwatch"
+# Debian: don't report bogons
+ARGS="-N"
diff --git a/packages/arpwatch/files/volatiles.08_arpwatch b/packages/arpwatch/files/volatiles.08_arpwatch
new file mode 100644
index 0000000000..216736153b
--- /dev/null
+++ b/packages/arpwatch/files/volatiles.08_arpwatch
@@ -0,0 +1,2 @@
+# <type> <owner> <group> <mode> <path> <linksource>
+d root root 0775 /var/lib/arpwatch none