Fixed -u.Thank Rajiv Aaron Manglani for report in bug #147090. Also fixed deadlock cased by call of non-reentrant function in signal callback.

(Portage version: 2.1.1)

3 files changed, 51 insertions, 0 deletions

diff --git a/net-analyzer/arpwatch/files/arpwatch.confd-2 b/net-analyzer/arpwatch/files/arpwatch.confd-2
new file mode 100644
index 000000000000..960454e79d79
--- /dev/null
+++ b/net-analyzer/arpwatch/files/arpwatch.confd-2
@@ -0,0 +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"
+
+# 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
new file mode 100644
index 000000000000..15ae358e6bc9
--- /dev/null
+++ b/net-analyzer/arpwatch/files/arpwatch.init-2
@@ -0,0 +1,36 @@
+#!/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 $
+
+depend() {
+	need net
+}
+
+start() {
+	for IFACE in ${IFACES}
+	do
+		ebegin "Starting arpwatch on ${IFACE}"
+		DATAFILE=/var/lib/arpwatch/${IFACE}.dat
+		[ ! -f ${DATAFILE} ] && touch ${DATAFILE}
+
+		if [ -z ${ARPUSER} ]; then
+			start-stop-daemon --start --quiet --pidfile=/var/run/arpwatch.${IFACE}.pid --exec \
+			/usr/sbin/arpwatch -- -i ${IFACE} -f ${DATAFILE} ${OPTIONS}
+		else
+			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() {
+	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.15-r1 b/net-analyzer/arpwatch/files/digest-arpwatch-2.1.15-r1
new file mode 100644
index 000000000000..a851e3f042c4
--- /dev/null
+++ b/net-analyzer/arpwatch/files/digest-arpwatch-2.1.15-r1
@@ -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 b82bd7155cf0226d7ca591c60cdc5e18 arpwatch-patchset-0.1.tbz2 14725
+RMD160 00143bb028b4c238b12715dfd40b74f247915cee arpwatch-patchset-0.1.tbz2 14725
+SHA256 5860d6eaba671c2e61dfa843fb103f6d86190ef2040c8eb2fb298d237af53976 arpwatch-patchset-0.1.tbz2 14725