Almost a complete rewrite. Rewrote some patches. Changed some init scripts. Addressed bug #111373

Package-Manager: portage-2.0.51.22-r3

7 files changed, 106 insertions, 18 deletions

diff --git a/net-analyzer/arpwatch/ChangeLog b/net-analyzer/arpwatch/ChangeLog
index a23839411f03..4b32898bc1bf 100644
--- a/net-analyzer/arpwatch/ChangeLog
+++ b/net-analyzer/arpwatch/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/arpwatch
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/ChangeLog,v 1.13 2005/05/01 17:09:03 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/ChangeLog,v 1.14 2005/11/26 18:41:07 strerror Exp $
+
+*arpwatch-2.1.13 (26 Nov 2005)
+
+  26 Nov 2005; Benjamin Smee <strerror@gentoo.org>
+  +files/arpwatch-2.1.13.diff.gz, files/arpwatch.confd, files/arpwatch.init,
+  +arpwatch-2.1.13.ebuild:
+  Almost a complete rewrite. Rewrote some patches. Changed some init scripts.
+  Addressed bug #111373
 
   01 May 2005; Michael Hanselmann <hansmi@gentoo.org>
   arpwatch-2.1.11-r1.ebuild:
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index 54e132ebf9d5..a3a97ff9c42c 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -1,17 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a672212325a4762b94f27af7937a0cca ChangeLog 1470
+MD5 9d932b911794c48bba16d48e5771bb07 arpwatch-2.1.13.ebuild 1998
 MD5 3c9c459c2feac485d0974d0af61ba60e arpwatch-2.1.11-r1.ebuild 1553
+MD5 95b9e77517698c021e58a2ee7dc15113 ChangeLog 1762
+MD5 26e100db2774909ccef9b75ede330dbe metadata.xml 252
 MD5 4bbdab8340cc812da6fc2fd5f0b22e0d files/arpwatch-2.1.11-r1.diff.gz 7550
-MD5 e2b8fb77ed42d85c3c9f5576964c7e74 files/arpwatch.confd 124
-MD5 04d7740490d1e3461332d7dddb3e516f files/arpwatch.init 654
 MD5 6d77d35ffc64dc4cba17ef3e2093d067 files/digest-arpwatch-2.1.11-r1 67
-MD5 26e100db2774909ccef9b75ede330dbe metadata.xml 252
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC0BfmI1lqEGTUzyQRAob+AJ9d+hZxf6SneTMceug4rpU+U0m7HwCfZtyB
-4nXkI2YXO8XTtI4DzXyyzhs=
-=yziH
------END PGP SIGNATURE-----
+MD5 fca5198d26c68ecfabc3a7f06a5c3379 files/digest-arpwatch-2.1.13 67
+MD5 8808ec9f2b2b2c22000e3f4542e7ce0e files/arpwatch-2.1.13.diff.gz 7863
+MD5 bd6966c6a0a14035dac0a50d6bde12aa files/arpwatch.confd 141
+MD5 282c16ef5bd0867b35295ae6bd0eaafd files/arpwatch.init 673
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.13.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.13.ebuild
new file mode 100644
index 000000000000..25f0afb56ce1
--- /dev/null
+++ b/net-analyzer/arpwatch/arpwatch-2.1.13.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/arpwatch-2.1.13.ebuild,v 1.1 2005/11/26 18:41:07 strerror Exp $
+
+inherit eutils
+
+MY_P=arpwatch-2.1a13
+DESCRIPTION="An ethernet monitor program that keeps track of ethernet/ip address pairings"
+HOMEPAGE="http://www-nrg.ee.lbl.gov/"
+SRC_URI="ftp://ftp.ee.lbl.gov/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="selinux"
+
+DEPEND="virtual/libpcap
+	sys-libs/ncurses"
+
+RDEPEND="selinux? ( sec-policy/selinux-arpwatch )"
+
+pkg_setup() {
+	enewgroup arpwatch
+	enewuser arpwatch -1 -1 /var/lib/arpwatch arpwatch
+}
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	einfo "Patching arpwatch with debian and redhat patches"
+	gzip -dc ${FILESDIR}/${P}.diff.gz | patch -s
+}
+
+src_compile() {
+	local myconf
+	myconf="${myconf} --prefix=/usr --infodir=/usr/share/info --mandir=/usr/share/man"
+
+	#./configure \
+	#	--prefix=/usr \
+	#	--infodir=/usr/share/info \
+	#	--mandir=/usr/share/man \
+	#	|| die "./configure failed"
+	econf \
+	${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+
+	dodir /var/lib/arpwatch /usr/sbin
+	diropts -g arpwatch -o arpwatch
+	keepdir /var/lib/arpwatch
+
+	make DESTDIR="${D}" install || die "install failed"
+	#einstall || die "einstall failed"
+
+	doman *.8
+	dodoc README CHANGES
+
+
+	exeinto /var/lib/arpwatch
+	exeopts -m0755 -o arpwatch -g arpwatch
+	doexe arp2ethers arpfetch bihourly massagevendor massagevendor-old
+
+	insinto /var/lib/arpwatch
+	insopts -m0644 -o arpwatch -g arpwatch
+	doins d.awk duplicates.awk e.awk euppertolower.awk p.awk
+
+	insinto /usr/share/arpwatch
+	insopts -m0644 -o arpwatch -g arpwatch
+	doins ethercodes.dat
+
+	newinitd "${FILESDIR}/arpwatch.init" arpwatch
+
+	newconfd "${FILESDIR}/arpwatch.confd" arpwatch
+
+}
+pkg_postinst() {
+	einfo "If you want arpwatch to at boot then type:"
+	ewarn "      rc-update add arpwatch default"
+}
diff --git a/net-analyzer/arpwatch/files/arpwatch-2.1.13.diff.gz b/net-analyzer/arpwatch/files/arpwatch-2.1.13.diff.gz
new file mode 100644
index 000000000000..6a8a294e181a
--- /dev/null
+++ b/net-analyzer/arpwatch/files/arpwatch-2.1.13.diff.gz
diff --git a/net-analyzer/arpwatch/files/arpwatch.confd b/net-analyzer/arpwatch/files/arpwatch.confd
index 58d85600c311..7a90a7681ec6 100644
--- a/net-analyzer/arpwatch/files/arpwatch.confd
+++ b/net-analyzer/arpwatch/files/arpwatch.confd
@@ -4,4 +4,6 @@
 #IFACES="eth0 eth1"
 IFACES="eth0"
 
+USER="arpwatch"
+
 OPTIONS=""
diff --git a/net-analyzer/arpwatch/files/arpwatch.init b/net-analyzer/arpwatch/files/arpwatch.init
index a4be65594c86..25f3f84fad91 100644
--- a/net-analyzer/arpwatch/files/arpwatch.init
+++ b/net-analyzer/arpwatch/files/arpwatch.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/files/arpwatch.init,v 1.5 2004/07/14 22:58:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/files/arpwatch.init,v 1.6 2005/11/26 18:41:07 strerror Exp $
 
 depend() {
 	need net
@@ -12,11 +12,11 @@ start() {
 	for IFACE in ${IFACES}
 	do
 		ebegin "Starting arpwatch on ${IFACE}"
-		DATAFILE=/var/arpwatch/${IFACE}.dat
+		DATAFILE=/var/lib/arpwatch/${IFACE}.dat
 		if [ ! -f ${DATAFILE} ]; then
 			touch ${DATAFILE}
 		fi
-		/usr/sbin/arpwatch -i $IFACE -f /var/arpwatch/$IFACE.dat ${OPTIONS}
+		/usr/sbin/arpwatch -i $IFACE -u ${USER} -f /var/lib/arpwatch/$IFACE.dat ${OPTIONS}
 		result=$?
 		eend $result
 	done
diff --git a/net-analyzer/arpwatch/files/digest-arpwatch-2.1.13 b/net-analyzer/arpwatch/files/digest-arpwatch-2.1.13
new file mode 100644
index 000000000000..d26dd81a8d8c
--- /dev/null
+++ b/net-analyzer/arpwatch/files/digest-arpwatch-2.1.13
@@ -0,0 +1 @@
+MD5 b9ff9739cdd2c0e9807b2d05860e4811 arpwatch-2.1a13.tar.gz 152779