7 files changed, 22 insertions, 95 deletions
diff --git a/net-analyzer/arpwatch/ChangeLog b/net-analyzer/arpwatch/ChangeLog
index 48f4f65fff31..c56226bb406f 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.17 2005/12/07 14:54:12 strerror Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/ChangeLog,v 1.18 2006/01/22 17:43:41 vanquirius Exp $
+
+*arpwatch-2.1.13-r2 (22 Jan 2006)
+
+  22 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> files/arpwatch.init,
+  -arpwatch-2.1.13.ebuild, -arpwatch-2.1.13-r1.ebuild,
+  +arpwatch-2.1.13-r2.ebuild:
+  Use setsid in initscript so that it works with splashutils for bug 119946.
+  Thanks to Michael Mauch <michael dot mauch at gmx dot de>.
 
 *arpwatch-2.1.13-r1 (07 Dec 2005)
 
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index 788a5810dcd3..445be704b1ff 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -1,12 +1,10 @@
-MD5 8b668c3da592bae2d3a783a9eea6edba arpwatch-2.1.13.ebuild 1842
+MD5 a5f60ec99a0493b9ee70a1b8e5039603 ChangeLog 2514
 MD5 3c9c459c2feac485d0974d0af61ba60e arpwatch-2.1.11-r1.ebuild 1553
-MD5 782c16e90a774842ab752d15b46d7969 arpwatch-2.1.13-r1.ebuild 2125
-MD5 14c7509ac9130625102e6c39988dffa8 ChangeLog 2180
-MD5 26e100db2774909ccef9b75ede330dbe metadata.xml 252
+MD5 db49847f10090c52d51f03ddd2dbf431 arpwatch-2.1.13-r2.ebuild 2127
 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 d71450140bb1d62d44244bf767f791ce files/arpwatch.confd 145
-MD5 39bc9ce5f109643a1b0cb542f93ebb51 files/arpwatch.init 772
+MD5 a18b6374f774735a36039566c7bc16fa files/arpwatch.init 788
+MD5 6d77d35ffc64dc4cba17ef3e2093d067 files/digest-arpwatch-2.1.11-r1 67
+MD5 fca5198d26c68ecfabc3a7f06a5c3379 files/digest-arpwatch-2.1.13-r2 67
+MD5 26e100db2774909ccef9b75ede330dbe metadata.xml 252
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.13-r1.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.13-r2.ebuild
index 37cb623af2d4..cf99732439c0 100644
--- a/net-analyzer/arpwatch/arpwatch-2.1.13-r1.ebuild
+++ b/net-analyzer/arpwatch/arpwatch-2.1.13-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.13-r1.ebuild,v 1.1 2005/12/07 14:54:12 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/arpwatch-2.1.13-r2.ebuild,v 1.1 2006/01/22 17:43:41 vanquirius Exp $
 
 inherit eutils versionator
 
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.13.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.13.ebuild
deleted file mode 100644
index 2946a1a97bf3..000000000000
--- a/net-analyzer/arpwatch/arpwatch-2.1.13.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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.3 2005/12/07 11:26:17 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"
-
-	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 /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 start at boot then type:"
-	ewarn "      rc-update add arpwatch default"
-}
diff --git a/net-analyzer/arpwatch/files/arpwatch.init b/net-analyzer/arpwatch/files/arpwatch.init
index b70b4e045460..ef2a462d9ba2 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
+# 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.7 2005/12/07 14:54:12 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/files/arpwatch.init,v 1.8 2006/01/22 17:43:41 vanquirius Exp $
 
 depend() {
 	need net
@@ -17,10 +17,10 @@ start() {
 			touch ${DATAFILE}
 		fi
 		if [ -z ${ARPUSER} ]; then
-			/usr/sbin/arpwatch -i $IFACE -f /var/lib/arpwatch/$IFACE.dat ${OPTIONS}
+			setsid /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}
+			setsid /usr/sbin/arpwatch -i $IFACE -u ${ARPUSER} -f /var/lib/arpwatch/$IFACE.dat ${OPTIONS}
 			eend $?
 		fi
 	done
diff --git a/net-analyzer/arpwatch/files/digest-arpwatch-2.1.13-r1 b/net-analyzer/arpwatch/files/digest-arpwatch-2.1.13-r1
deleted file mode 100644
index d26dd81a8d8c..000000000000
--- a/net-analyzer/arpwatch/files/digest-arpwatch-2.1.13-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b9ff9739cdd2c0e9807b2d05860e4811 arpwatch-2.1a13.tar.gz 152779
diff --git a/net-analyzer/arpwatch/files/digest-arpwatch-2.1.13 b/net-analyzer/arpwatch/files/digest-arpwatch-2.1.13-r2
index d26dd81a8d8c..d26dd81a8d8c 100644
--- a/net-analyzer/arpwatch/files/digest-arpwatch-2.1.13
+++ b/net-analyzer/arpwatch/files/digest-arpwatch-2.1.13-r2