Fixed confd and initscript. Other changes for bug #111373

(Portage version: 2.0.51.22-r3)

6 files changed, 104 insertions, 11 deletions

diff --git a/net-analyzer/arpwatch/ChangeLog b/net-analyzer/arpwatch/ChangeLog
index a0bdc9574493..48f4f65fff31 100644
--- a/net-analyzer/arpwatch/ChangeLog
+++ b/net-analyzer/arpwatch/ChangeLog
@@ -1,6 +1,12 @@
 # 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.16 2005/12/07 11:26:17 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/ChangeLog,v 1.17 2005/12/07 14:54:12 strerror Exp $
+
+*arpwatch-2.1.13-r1 (07 Dec 2005)
+
+  07 Dec 2005; Benjamin Smee <strerror@gentoo.org> files/arpwatch.confd,
+  files/arpwatch.init, +arpwatch-2.1.13-r1.ebuild:
+  Fixed confd and initscript. Other changes for bug #111373
 
   07 Dec 2005; Benjamin Smee <strerror@gentoo.org> arpwatch-2.1.13.ebuild:
   small typo fix
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index 4d2cf875ae6f..865aec9fa044 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -1,10 +1,12 @@
 MD5 8b668c3da592bae2d3a783a9eea6edba arpwatch-2.1.13.ebuild 1842
 MD5 3c9c459c2feac485d0974d0af61ba60e arpwatch-2.1.11-r1.ebuild 1553
-MD5 66fd405a9c0cff6d8cb3e89a001ff2e6 ChangeLog 1960
+MD5 27232dc6c799181a011f1dd55221781e arpwatch-2.1.13-r1.ebuild 2122
+MD5 90c9ac6d8e2cb1c33e2e924631f24287 ChangeLog 2180
 MD5 26e100db2774909ccef9b75ede330dbe metadata.xml 252
 MD5 4bbdab8340cc812da6fc2fd5f0b22e0d files/arpwatch-2.1.11-r1.diff.gz 7550
 MD5 6d77d35ffc64dc4cba17ef3e2093d067 files/digest-arpwatch-2.1.11-r1 67
+MD5 fca5198d26c68ecfabc3a7f06a5c3379 files/digest-arpwatch-2.1.13-r1 67
 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
+MD5 d71450140bb1d62d44244bf767f791ce files/arpwatch.confd 145
+MD5 31346a98a624ec474fa22294eba9d70d files/arpwatch.init 772
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.13-r1.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.13-r1.ebuild
new file mode 100644
index 000000000000..37cb623af2d4
--- /dev/null
+++ b/net-analyzer/arpwatch/arpwatch-2.1.13-r1.ebuild
@@ -0,0 +1,81 @@
+# 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-r1.ebuild,v 1.1 2005/12/07 14:54:12 strerror Exp $
+
+inherit eutils versionator
+
+#MY_P=${PN}-${PV%.*}a${PV##*.}
+MY_P="${PN}-$(replace_version_separator 2 'a')"
+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"
+
+	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"
+	doman *.8
+	dodoc README CHANGES
+
+	exeinto /usr/share/doc/${PF}/
+	exeopts -m0755 -o arpwatch -g arpwatch
+	doexe arp2ethers arpfetch bihourly massagevendor massagevendor-old
+
+	insinto /usr/share/doc/${PF}/
+	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 start at boot then type:"
+	einfo "      rc-update add arpwatch default"
+	einfo "To enable arpwatch to run as a user please uncomment"
+	einfo "the appropriate line in /etc/conf.d/arpwatch"
+	einfo "Some scripts that come with the package are in:"
+	einfo "/usr/share/doc/${PF}/"
+}
diff --git a/net-analyzer/arpwatch/files/arpwatch.confd b/net-analyzer/arpwatch/files/arpwatch.confd
index 7a90a7681ec6..fc1bae4227c9 100644
--- a/net-analyzer/arpwatch/files/arpwatch.confd
+++ b/net-analyzer/arpwatch/files/arpwatch.confd
@@ -4,6 +4,6 @@
 #IFACES="eth0 eth1"
 IFACES="eth0"
 
-USER="arpwatch"
+#ARPUSER="arpwatch"
 
 OPTIONS=""
diff --git a/net-analyzer/arpwatch/files/arpwatch.init b/net-analyzer/arpwatch/files/arpwatch.init
index 25f3f84fad91..b70b4e045460 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.6 2005/11/26 18:41:07 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/files/arpwatch.init,v 1.7 2005/12/07 14:54:12 strerror Exp $
 
 depend() {
 	need net
@@ -16,15 +16,18 @@ start() {
 		if [ ! -f ${DATAFILE} ]; then
 			touch ${DATAFILE}
 		fi
-		/usr/sbin/arpwatch -i $IFACE -u ${USER} -f /var/lib/arpwatch/$IFACE.dat ${OPTIONS}
-		result=$?
-		eend $result
+		if [ -z ${ARPUSER} ]; then
+			/usr/sbin/arpwatch -i $IFACE -f /var/lib/arpwatch/$IFACE.dat ${OPTIONS}
+			eend $?
+		else
+			/usr/sbin/arpwatch -i $IFACE -u ${ARPUSER} -f /var/lib/arpwatch/$IFACE.dat ${OPTIONS}
+			eend $?
+		fi
 	done
 }
 
 stop() {
 	ebegin "Stopping arpwatch"
 	killall arpwatch > /dev/null
-	result=$?
-	eend $result
+	eend $?
 }
diff --git a/net-analyzer/arpwatch/files/digest-arpwatch-2.1.13-r1 b/net-analyzer/arpwatch/files/digest-arpwatch-2.1.13-r1
new file mode 100644
index 000000000000..d26dd81a8d8c
--- /dev/null
+++ b/net-analyzer/arpwatch/files/digest-arpwatch-2.1.13-r1
@@ -0,0 +1 @@
+MD5 b9ff9739cdd2c0e9807b2d05860e4811 arpwatch-2.1a13.tar.gz 152779