Fixed permition problem reported in bug #171989. Added pid patch to fix start/stop problem.

(Portage version: 2.1.2.2)

5 files changed, 99 insertions, 13 deletions

diff --git a/net-analyzer/arpwatch/ChangeLog b/net-analyzer/arpwatch/ChangeLog
index 65384bc198a2..86da912d369e 100644
--- a/net-analyzer/arpwatch/ChangeLog
+++ b/net-analyzer/arpwatch/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/arpwatch
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/ChangeLog,v 1.39 2007/02/01 21:09:13 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/ChangeLog,v 1.40 2007/03/27 19:33:47 pva Exp $
+
+*arpwatch-2.1.15-r4 (27 Mar 2007)
+
+  27 Mar 2007; <pva@gentoo.org> -files/arpwatch.confd-2,
+  files/arpwatch.init-2, +arpwatch-2.1.15-r4.ebuild:
+  Fixed permition problem reported in bug #171989. Added pid patch to fix
+  start/stop problem.
 
   01 Feb 2007; Markus Ullmann <jokey@gentoo.org> files/arpwatch.confd,
   files/arpwatch.init, -arpwatch-2.1.11-r1.ebuild,
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r4.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r4.ebuild
new file mode 100644
index 000000000000..72db8dca1509
--- /dev/null
+++ b/net-analyzer/arpwatch/arpwatch-2.1.15-r4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/arpwatch-2.1.15-r4.ebuild,v 1.1 2007/03/27 19:33:47 pva Exp $
+
+inherit eutils versionator
+
+PATCH_VER="0.4"
+
+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
+	mirror://gentoo/arpwatch-patchset-${PATCH_VER}.tbz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc sparc x86"
+IUSE="selinux"
+
+DEPEND="virtual/libpcap
+	sys-libs/ncurses"
+
+RDEPEND="${DEPEND}
+		selinux? ( sec-policy/selinux-arpwatch )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	EPATCH_SOURCE="${WORKDIR}"/arpwatch-patchset/
+	EPATCH_SUFFIX="patch"
+	epatch
+	cp "${WORKDIR}"/arpwatch-patchset/*.8 . || die "Failed to get man-pages from arpwatch-patchset."
+}
+
+src_compile() {
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	dosbin arpwatch arpsnmp arp2ethers massagevendor arpfetch bihourly.sh
+	doman arpwatch.8 arpsnmp.8 arp2ethers.8 massagevendor.8 arpfetch.8 bihourly.8
+
+	insinto /usr/share/arpwatch
+	doins ethercodes.dat
+
+	insinto /usr/share/arpwatch/awk
+	doins duplicates.awk euppertolower.awk p.awk e.awk d.awk
+
+	keepdir /var/lib/arpwatch
+	dodoc README CHANGES
+
+	newinitd "${FILESDIR}"/arpwatch.init-2 arpwatch
+	newconfd "${FILESDIR}"/arpwatch.confd arpwatch
+}
+
+pkg_config() {
+	enewgroup arpwatch
+	enewuser arpwatch -1 -1 /var/lib/arpwatch arpwatch
+
+	einfo "Setting permitions for data directory"
+	chown -R arpwatch:arpwatch /var/lib/arpwatch
+
+	cat >> /etc/conf.d/arpwatch << EOF
+
+# Uncomment this line if you wish arpwatch to drop privileges.
+ARPUSER="arpwatch"
+EOF
+	einfo "Done."
+}
+
+pkg_postinst() {
+	elog "For security reasons it is better to run arpwatch as an unprivileged user."
+	elog "If you wish to do so, please, run:"
+	elog "      emerge --config arpwatch"
+	echo
+	ewarn "Note: some scripts require snmpwalk utility from net-analyzer/net-snmp"
+}
diff --git a/net-analyzer/arpwatch/files/arpwatch.confd-2 b/net-analyzer/arpwatch/files/arpwatch.confd-2
deleted file mode 100644
index 960454e79d79..000000000000
--- a/net-analyzer/arpwatch/files/arpwatch.confd-2
+++ /dev/null
@@ -1,9 +0,0 @@
-# Config file for /etc/init.d/arpwatch
-# see arpwatch.8 for more information
-# execute `emerge --config arpwatch` to configure arpwatch runas unprivileged user.
-
-#IFACES="eth0 eth1"
-IFACES="eth0"
-
-# Additional options to pass to arpwatch.
-OPTIONS="-N -p"
diff --git a/net-analyzer/arpwatch/files/arpwatch.init-2 b/net-analyzer/arpwatch/files/arpwatch.init-2
index 15ae358e6bc9..4929e6278c01 100644
--- a/net-analyzer/arpwatch/files/arpwatch.init-2
+++ b/net-analyzer/arpwatch/files/arpwatch.init-2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/files/arpwatch.init-2,v 1.1 2006/09/23 19:10:29 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/files/arpwatch.init-2,v 1.2 2007/03/27 19:33:47 pva Exp $
 
 depend() {
 	need net
@@ -16,10 +16,11 @@ start() {
 
 		if [ -z ${ARPUSER} ]; then
 			start-stop-daemon --start --quiet --pidfile=/var/run/arpwatch.${IFACE}.pid --exec \
-			/usr/sbin/arpwatch -- -i ${IFACE} -f ${DATAFILE} ${OPTIONS}
+			/usr/sbin/arpwatch -- -i ${IFACE} -f ${DATAFILE} -P /var/run/arpwatch.${IFACE}.pid ${OPTIONS}
 		else
+			chown ${ARPUSER} ${DATAFILE}
 			start-stop-daemon --start --quiet --pidfile=/var/run/arpwatch.${IFACE}.pid --exec \
-			/usr/sbin/arpwatch -- -i $IFACE -u ${ARPUSER} -f ${DATAFILE} ${OPTIONS}
+			/usr/sbin/arpwatch -- -i $IFACE -u ${ARPUSER} -f ${DATAFILE} -P /var/run/arpwatch.${IFACE}.pid ${OPTIONS}
 		fi
 		eend $?
 	done
diff --git a/net-analyzer/arpwatch/files/digest-arpwatch-2.1.15-r4 b/net-analyzer/arpwatch/files/digest-arpwatch-2.1.15-r4
new file mode 100644
index 000000000000..aeac5338f385
--- /dev/null
+++ b/net-analyzer/arpwatch/files/digest-arpwatch-2.1.15-r4
@@ -0,0 +1,6 @@
+MD5 cebfeb99c4a7c2a6cee2564770415fe7 arpwatch-2.1a15.tar.gz 202729
+RMD160 a27ee53275dcec3cafb85eb3df2451d42ec32b0c arpwatch-2.1a15.tar.gz 202729
+SHA256 c1df9737e208a96a61fa92ddad83f4b4d9be66f8992f3c917e9edf4b05ff5898 arpwatch-2.1a15.tar.gz 202729
+MD5 69c76fdb1bcf3d172ac1e730c61b3f6a arpwatch-patchset-0.4.tbz2 16350
+RMD160 9e9ae77ef38591af72687fa7014b4c56fc4c4d2c arpwatch-patchset-0.4.tbz2 16350
+SHA256 f49deed64301078a00881fa9c27bb3a4116b9096cfe880f5a0bcc9913b439a18 arpwatch-patchset-0.4.tbz2 16350