merge of 22b6c89379f44959daad0672b60b3b2775b9364a

     and a9d332834a83bff1778ad969b7e1514a83a3c137

107 files changed, 9778 insertions, 1661 deletions

diff --git a/packages/curl/curl-7.12.2/.mtn2git_empty b/packages/arpwatch/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/curl/curl-7.12.2/.mtn2git_empty
+++ b/packages/arpwatch/.mtn2git_empty
diff --git a/packages/arpwatch/arpwatch_2.1a13.bb b/packages/arpwatch/arpwatch_2.1a13.bb
new file mode 100644
index 0000000000..45daae30f4
--- /dev/null
+++ b/packages/arpwatch/arpwatch_2.1a13.bb
@@ -0,0 +1,47 @@
+DESCRIPTION = "Ethernet/FDDI station activity monitor"
+LICENSE = "BSD"
+SECTION = "network"
+HOMEPAGE = "http://www-nrg.ee.lbl.gov/"
+RRECOMMENDS = "arpwatch-data"
+
+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"
+
+inherit autotools
+
+EXTRA_OEMAKE = "LDFLAGS=-L${STAGING_LIBDIR}"
+
+fakeroot do_install() {
+    install -d ${D}${bindir} ${D}${sbindir} ${D}${mandir}/man8 \
+               ${D}${sysconfdir}/default \
+               ${D}${sysconfdir}/init.d \
+               ${D}${datadir}/arpwatch
+
+    oe_runmake install DESTDIR=${D}
+    oe_runmake install-man DESTDIR=${D}
+
+    install -m 0755 ${S}/arp2ethers         ${D}${sbindir}
+    install -m 0755 ${S}/arpfetch           ${D}${sbindir}
+    install -m 0755 ${S}/bihourly           ${D}${sbindir}
+    install -m 0755 ${S}/massagevendor      ${D}${sbindir}
+
+    install -m 0644 ${S}/arp2ethers.8      ${D}${mandir}/man8
+    install -m 0644 ${S}/arpfetch.8        ${D}${mandir}/man8
+    install -m 0644 ${S}/bihourly.8        ${D}${mandir}/man8
+    install -m 0644 ${S}/massagevendor.8   ${D}${mandir}/man8
+
+    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
+}
+
+PACKAGES =+ "arpwatch-data"
+FILES_arpwatch-data = "${datadir}/arpwatch/ethercodes.dat"
diff --git a/packages/curl/files/.mtn2git_empty b/packages/arpwatch/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/curl/files/.mtn2git_empty
+++ b/packages/arpwatch/files/.mtn2git_empty
diff --git a/packages/arpwatch/files/05debian_fhs.patch b/packages/arpwatch/files/05debian_fhs.patch
new file mode 100644
index 0000000000..208c65108b
--- /dev/null
+++ b/packages/arpwatch/files/05debian_fhs.patch
@@ -0,0 +1,103 @@
+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
+@@ -1,4 +1,4 @@
+-.\" @(#) $Id: arpsnmp.8,v 1.5 2000/09/17 20:34:41 leres Exp $ (LBL)
++.\" @(#) $Id: arpsnmp.8,v 1.5 2001/04/17 20:34:41 leres Exp $ (LBL)
+ .\"
+ .\" Copyright (c) 1996, 1997, 1999, 2000
+ .\"	The Regents of the University of California.  All rights reserved.
+@@ -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
+@@ -1,4 +1,4 @@
+-.\" @(#) $Id: arpwatch.8,v 1.13 2000/10/08 20:31:25 leres Exp $ (LBL)
++.\" @(#) $Id: arpwatch.8,v 1.13 2001/04/17 20:31:25 leres Exp $ (LBL)
+ .\"
+ .\" Copyright (c) 1992, 1994, 1996, 1997, 2000
+ .\"	The Regents of the University of California.  All rights reserved.
+@@ -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:1.1.1.1	Tue Apr 17 13:31:36 2001
++++ arpwatch/bihourly	Tue Apr 17 13:53:29 2001
+@@ -6,7 +6,7 @@
+ PATH=$PATH:/usr/local/sbin
+ export PATH
+ #
+-cd /usr/operator/arpwatch
++cd /var/lib/arpwatch
+ #
+ list=`cat list`
+ cname=`cat cname`
+@@ -14,7 +14,7 @@
+ #
+ alist=""