cleanup

(Portage version: 2.1.2-r1)

8 files changed, 29 insertions, 181 deletions

diff --git a/net-analyzer/arpwatch/ChangeLog b/net-analyzer/arpwatch/ChangeLog
index 13aa2f73e6fa..65384bc198a2 100644
--- a/net-analyzer/arpwatch/ChangeLog
+++ b/net-analyzer/arpwatch/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/arpwatch
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/ChangeLog,v 1.38 2006/12/11 10:31:20 pva Exp $
+# 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 $
+
+  01 Feb 2007; Markus Ullmann <jokey@gentoo.org> files/arpwatch.confd,
+  files/arpwatch.init, -arpwatch-2.1.11-r1.ebuild,
+  -arpwatch-2.1.15-r2.ebuild, arpwatch-2.1.15-r3.ebuild:
+  cleanup
 
 *arpwatch-2.1.15-r3 (11 Dec 2006)
 
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.11-r1.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.11-r1.ebuild
deleted file mode 100644
index c91fd1b05926..000000000000
--- a/net-analyzer/arpwatch/arpwatch-2.1.11-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/arpwatch-2.1.11-r1.ebuild,v 1.17 2006/06/14 10:36:22 pva Exp $
-
-MY_P=arpwatch-2.1a11
-S="${WORKDIR}/${MY_P}"
-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/${P}-r1.diff.gz"
-
-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 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	einfo "Patching arpwatch with debian and redhat patches"
-	gzip -dc "${DISTDIR}"/${P}-r1.diff.gz | patch -s
-}
-
-src_compile() {
-
-	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		|| die "./configure failed"
-	emake || die
-}
-
-src_install () {
-	dodir /var/arpwatch /usr/sbin
-	keepdir /var/arpwatch
-
-	make DESTDIR="${D}" install || die
-
-	doman *.8
-
-	exeinto /var/arpwatch
-	doexe arp2ethers arpfetch bihourly massagevendor massagevendor-old
-
-	insinto /var/arpwatch
-	doins d.awk duplicates.awk e.awk euppertolower.awk p.awk
-
-	insinto /usr/share/arpwatch
-	doins ethercodes.dat
-
-	dodoc README CHANGES
-	exeinto /etc/init.d ; newexe "${FILESDIR}"/arpwatch.init arpwatch
-
-	insinto /etc/conf.d
-	newins "${FILESDIR}"/arpwatch.confd arpwatch
-
-}
-pkg_postinst() {
-	ewarn "NOTE: if you want to run arpwatch on boot then execute"
-	ewarn "      rc-update add arpwatch default"
-}
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r2.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r2.ebuild
deleted file mode 100644
index 2b656bd8a65f..000000000000
--- a/net-analyzer/arpwatch/arpwatch-2.1.15-r2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2006 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-r2.ebuild,v 1.6 2006/11/23 19:49:19 blubb Exp $
-
-inherit eutils versionator
-
-PATCH_VER="0.2"
-
-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
-	mv "${WORKDIR}"/arpwatch-patchset/*.8 .
-}
-
-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-2 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/arpwatch-2.1.15-r3.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r3.ebuild
index e8afe93359e7..90068c1fafe7 100644
--- a/net-analyzer/arpwatch/arpwatch-2.1.15-r3.ebuild
+++ b/net-analyzer/arpwatch/arpwatch-2.1.15-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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-r3.ebuild,v 1.2 2006/12/11 10:33:44 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/arpwatch-2.1.15-r3.ebuild,v 1.3 2007/02/01 21:09:13 jokey Exp $
 
 inherit eutils versionator
 
@@ -53,8 +53,8 @@ src_install () {
 	keepdir /var/lib/arpwatch
 	dodoc README CHANGES
 
-	newinitd "${FILESDIR}"/arpwatch.init-2 arpwatch
-	newconfd "${FILESDIR}"/arpwatch.confd-2 arpwatch
+	newinitd "${FILESDIR}"/arpwatch.init arpwatch
+	newconfd "${FILESDIR}"/arpwatch.confd arpwatch
 }
 
 pkg_config() {
diff --git a/net-analyzer/arpwatch/files/arpwatch.confd b/net-analyzer/arpwatch/files/arpwatch.confd
index fc1bae4227c9..960454e79d79 100644
--- a/net-analyzer/arpwatch/files/arpwatch.confd
+++ b/net-analyzer/arpwatch/files/arpwatch.confd
@@ -1,9 +1,9 @@
 # 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"
 
-#ARPUSER="arpwatch"
-
-OPTIONS=""
+# Additional options to pass to arpwatch.
+OPTIONS="-N -p"
diff --git a/net-analyzer/arpwatch/files/arpwatch.init b/net-analyzer/arpwatch/files/arpwatch.init
index bff9abeef761..f4c45bf90a9c 100644
--- a/net-analyzer/arpwatch/files/arpwatch.init
+++ b/net-analyzer/arpwatch/files/arpwatch.init
@@ -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,v 1.9 2006/09/08 10:44:00 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/files/arpwatch.init,v 1.10 2007/02/01 21:09:13 jokey Exp $
 
 depend() {
 	need net
@@ -12,21 +12,25 @@ start() {
 	do
 		ebegin "Starting arpwatch on ${IFACE}"
 		DATAFILE=/var/lib/arpwatch/${IFACE}.dat
-		if [ ! -f ${DATAFILE} ]; then
-			touch ${DATAFILE}
-		fi
+		[ ! -f ${DATAFILE} ] && touch ${DATAFILE}
+
 		if [ -z ${ARPUSER} ]; then
-			setsid /usr/sbin/arpwatch -i $IFACE -f /var/lib/arpwatch/$IFACE.dat ${OPTIONS}
-			eend $?
+			start-stop-daemon --start --quiet --pidfile=/var/run/arpwatch.${IFACE}.pid --exec \
+			/usr/sbin/arpwatch -- -i ${IFACE} -f ${DATAFILE} ${OPTIONS}
 		else
-			setsid /usr/sbin/arpwatch -i $IFACE -u ${ARPUSER} -f /var/lib/arpwatch/$IFACE.dat ${OPTIONS}
-			eend $?
+			start-stop-daemon --start --quiet --pidfile=/var/run/arpwatch.${IFACE}.pid --exec \
+			/usr/sbin/arpwatch -- -i $IFACE -u ${ARPUSER} -f ${DATAFILE} ${OPTIONS}
 		fi
+		eend $?
 	done
 }
 
 stop() {
-	ebegin "Stopping arpwatch"
-	killall arpwatch > /dev/null
-	eend $?
+	for IFACE in ${IFACES}
+	do
+		ebegin "Stopping arpwatch on ${IFACE}"
+		start-stop-daemon --stop --quiet --pidfile=/var/run/arpwatch.${IFACE}.pid --exec \
+		/usr/sbin/arpwatch
+		eend $?
+	done
 }
diff --git a/net-analyzer/arpwatch/files/digest-arpwatch-2.1.11-r1 b/net-analyzer/arpwatch/files/digest-arpwatch-2.1.11-r1
deleted file mode 100644
index f93cc26746a1..000000000000
--- a/net-analyzer/arpwatch/files/digest-arpwatch-2.1.11-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 4bbdab8340cc812da6fc2fd5f0b22e0d arpwatch-2.1.11-r1.diff.gz 7550
-RMD160 3c022ea0e96953b5a5c38463241b01ca219e32d7 arpwatch-2.1.11-r1.diff.gz 7550
-SHA256 41e373ef8e43435191a9126a1cc96ed055e5bf82882e1dbdcbb48781f533df63 arpwatch-2.1.11-r1.diff.gz 7550
-MD5 9ecd00db892737431b0e524f3e52e19e arpwatch-2.1a11.tar.gz 126550
-RMD160 e5932b488fbbe34926525e2795f31d2e8b3974dc arpwatch-2.1a11.tar.gz 126550
-SHA256 98224c1d4e09fa9d42a7de8dde4cd938d20633da87d3a6d8f936c93895be5fe6 arpwatch-2.1a11.tar.gz 126550
diff --git a/net-analyzer/arpwatch/files/digest-arpwatch-2.1.15-r2 b/net-analyzer/arpwatch/files/digest-arpwatch-2.1.15-r2
deleted file mode 100644
index c9129f6a2ddf..000000000000
--- a/net-analyzer/arpwatch/files/digest-arpwatch-2.1.15-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-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 bcf9f24eaa4b76ce85545fd549f30d8c arpwatch-patchset-0.2.tbz2 15087
-RMD160 f90ab345cd902b832da88410035d04d996d3cd76 arpwatch-patchset-0.2.tbz2 15087
-SHA256 95d37ec744d52995fa44abd86bb6618993bfceec14a6252c7fcdd89f7bdef873 arpwatch-patchset-0.2.tbz2 15087