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

Package-Manager: portage-2.1.1

7 files changed, 168 insertions, 19 deletions

diff --git a/net-analyzer/arpwatch/ChangeLog b/net-analyzer/arpwatch/ChangeLog
index 62a6340dbd7f..28b84100ec51 100644
--- a/net-analyzer/arpwatch/ChangeLog
+++ b/net-analyzer/arpwatch/ChangeLog
@@ -1,6 +1,13 @@
 # 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.28 2006/09/14 22:28:10 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/ChangeLog,v 1.29 2006/09/23 19:10:29 pva Exp $
+
+*arpwatch-2.1.15-r1 (23 Sep 2006)
+
+  23 Sep 2006; Peter Volkov <pva@gentoo.org> +files/arpwatch.confd-2,
+  +files/arpwatch.init-2, metadata.xml, +arpwatch-2.1.15-r1.ebuild:
+  Fixed -u.Thank Rajiv Aaron Manglani for report in bug #147090. Also fixed
+  deadlock cased by call of non-reentrant function in signal callback.
 
   14 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   arpwatch-2.1.13-r3.ebuild:
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index e5be601e289f..a84638b11e0c 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX arpwatch-2.1.13-lostparams.patch 1045 RMD160 5144a0eabc7f233b1292b90a09d54afd15c552f8 SHA1 4ff05ba96f083f12647bb7f48ecbea012840a9cf SHA256 a83374fe3cbf2fc25903f7bbfb5d2f26a5c67d72673ce5b76ca8b695e4e7854c
 MD5 d984166ea2c5c91e25fc14619678167b files/arpwatch-2.1.13-lostparams.patch 1045
 RMD160 5144a0eabc7f233b1292b90a09d54afd15c552f8 files/arpwatch-2.1.13-lostparams.patch 1045
@@ -9,16 +6,25 @@ AUX arpwatch.confd 145 RMD160 a28e71f549b55df40bc0541c1e2912ee618b5bbe SHA1 4012
 MD5 d71450140bb1d62d44244bf767f791ce files/arpwatch.confd 145
 RMD160 a28e71f549b55df40bc0541c1e2912ee618b5bbe files/arpwatch.confd 145
 SHA256 008e9c665bcf62cbecd3f16b8b5c750d660c15c8da63af42e1698151b70fe1be files/arpwatch.confd 145
+AUX arpwatch.confd-2 255 RMD160 7da14036617ccd32f8a8b2b50487b56446153f4c SHA1 9ca8f47b6957fe46b51fcab80bb0c49557435d5b SHA256 d45291719550899a6c8be2b1a4c6a416cf894b30b3be654adf7182151f63b77f
+MD5 ee7d2c3e5a7af87e4b18a1e23183c88d files/arpwatch.confd-2 255
+RMD160 7da14036617ccd32f8a8b2b50487b56446153f4c files/arpwatch.confd-2 255
+SHA256 d45291719550899a6c8be2b1a4c6a416cf894b30b3be654adf7182151f63b77f files/arpwatch.confd-2 255
 AUX arpwatch.init 770 RMD160 b3006f4504096c5809903cbf95d56427d0932d7d SHA1 1046f1ff8a8f396e8190cf6a98763fc673b05656 SHA256 ba47623a6deacaab3b3b4b589cc94c3adf5c188e493fe95007d1a5e6185d0e3c
 MD5 91b745c801cc89f14612ed19de35a044 files/arpwatch.init 770
 RMD160 b3006f4504096c5809903cbf95d56427d0932d7d files/arpwatch.init 770
 SHA256 ba47623a6deacaab3b3b4b589cc94c3adf5c188e493fe95007d1a5e6185d0e3c files/arpwatch.init 770
+AUX arpwatch.init-2 1005 RMD160 a28507e42f1c9fb78436de5e25ccb2a35e3eefba SHA1 de4c7ad9d11cb4e2321059a108ce52dba6e1d87a SHA256 6e19ef662d29307851045d4703678db7884e9ded2967bfa45e38cb4332a4c664
+MD5 09847c4c465b89dad79e7af245be7e41 files/arpwatch.init-2 1005
+RMD160 a28507e42f1c9fb78436de5e25ccb2a35e3eefba files/arpwatch.init-2 1005
+SHA256 6e19ef662d29307851045d4703678db7884e9ded2967bfa45e38cb4332a4c664 files/arpwatch.init-2 1005
 DIST arpwatch-2.1.11-r1.diff.gz 7550 RMD160 3c022ea0e96953b5a5c38463241b01ca219e32d7 SHA1 fed55d43b508ea6da59c5d00f453ea65c6290e06 SHA256 41e373ef8e43435191a9126a1cc96ed055e5bf82882e1dbdcbb48781f533df63
 DIST arpwatch-2.1.13.diff.gz 7863 RMD160 568f02d76463d1d4a32b43d79a678f9a5453c4b0 SHA1 12a99b20bbc235edf79449c84c1eebd8f64275f6 SHA256 7a3904570888e77eee7487c9456ceaa3029fd936928ef8684209f332ae5aa7ed
 DIST arpwatch-2.1.15-debian-and-redhat-patchset.diff.bz2 9218 RMD160 f0ba40e1124e60687ca84907bb8e90cc6a5fd28b SHA1 c354748a0204b894ec8a502def2550eb8202e29c SHA256 2ad215c7757152df385f95597a9b39907adf14df7da7cce8d1a8554fc4a38647
 DIST arpwatch-2.1a11.tar.gz 126550 RMD160 e5932b488fbbe34926525e2795f31d2e8b3974dc SHA1 d14f9218928885ea9b502461259513a815809be7 SHA256 98224c1d4e09fa9d42a7de8dde4cd938d20633da87d3a6d8f936c93895be5fe6
 DIST arpwatch-2.1a13.tar.gz 152779 RMD160 80b89d36d9c20e9d0ac272ba7b66494d2888a557 SHA1 03d98e239405529f97b742f04d2a9b837b5da43a SHA256 57025d5d1c883961ad7bbe53e5f0d73fa4b55659c28ee7722dddfc9c1512ee76
 DIST arpwatch-2.1a15.tar.gz 202729 RMD160 a27ee53275dcec3cafb85eb3df2451d42ec32b0c SHA1 9dffaec0f132e5bb7aedfc840c5c67068bfbce69 SHA256 c1df9737e208a96a61fa92ddad83f4b4d9be66f8992f3c917e9edf4b05ff5898
+DIST arpwatch-patchset-0.1.tbz2 14725 RMD160 00143bb028b4c238b12715dfd40b74f247915cee SHA1 efcf451e422cbb10cc694acce4c94897d5436efb SHA256 5860d6eaba671c2e61dfa843fb103f6d86190ef2040c8eb2fb298d237af53976
 EBUILD arpwatch-2.1.11-r1.ebuild 1606 RMD160 1a472abf216453731c6c89f8cdddd8e7a77a625d SHA1 cc4562a67d9267f208a2037cb8245accced62db7 SHA256 26d9d1c27159a6baa9a310381b181fbfd94564a87060dbd3c855eee80cf72c91
 MD5 a00231d8bd68c31f100514738a2d7a03 arpwatch-2.1.11-r1.ebuild 1606
 RMD160 1a472abf216453731c6c89f8cdddd8e7a77a625d arpwatch-2.1.11-r1.ebuild 1606
@@ -31,18 +37,22 @@ EBUILD arpwatch-2.1.13-r3.ebuild 2212 RMD160 37824d13ff1e908bb63e28c04d6951130ef
 MD5 779297f35d49608ccb601cdd5d5637aa arpwatch-2.1.13-r3.ebuild 2212
 RMD160 37824d13ff1e908bb63e28c04d6951130ef53563 arpwatch-2.1.13-r3.ebuild 2212
 SHA256 c1d494a20c366450ffe64228c9815859c9fa45a4e1af10b9e0fe1a6a0120c9f6 arpwatch-2.1.13-r3.ebuild 2212
+EBUILD arpwatch-2.1.15-r1.ebuild 2057 RMD160 3e298ef70688795de4c37cbc1b9e2eab7f4e0075 SHA1 6039585b03b0596f3f4a2cb8b5608ad940fe56c3 SHA256 6fa3bd98bb61c651a9b3a265af1e4135e41763bd059f3fabab7357ca6452785e
+MD5 84fbd1ad3730f708b13661da3af852a8 arpwatch-2.1.15-r1.ebuild 2057
+RMD160 3e298ef70688795de4c37cbc1b9e2eab7f4e0075 arpwatch-2.1.15-r1.ebuild 2057
+SHA256 6fa3bd98bb61c651a9b3a265af1e4135e41763bd059f3fabab7357ca6452785e arpwatch-2.1.15-r1.ebuild 2057
 EBUILD arpwatch-2.1.15.ebuild 2226 RMD160 9edabc9e2b2ce1add38e08ea645a8ef04677aec8 SHA1 a3cacaf0505e78130728a0d30f71b25c9ec531fb SHA256 e785c3794c43c1455822a97c109418e86b0470776b46850cc53d2e22f4f9bbae
 MD5 94f32c95b334d32d0ddc2a175b27d3e2 arpwatch-2.1.15.ebuild 2226
 RMD160 9edabc9e2b2ce1add38e08ea645a8ef04677aec8 arpwatch-2.1.15.ebuild 2226
 SHA256 e785c3794c43c1455822a97c109418e86b0470776b46850cc53d2e22f4f9bbae arpwatch-2.1.15.ebuild 2226
-MISC ChangeLog 4158 RMD160 0d83a4a5b9512ff7306f9eecb4eb580b999c40d9 SHA1 6872e234380e961dc9150253144aa49ac2c53f7f SHA256 ade8895c76251251113a9bb30a60469753ddb50dcab9cbbd92a2b6e3275566bd
-MD5 c55bdf497b832863db846ef5e47d1c3d ChangeLog 4158
-RMD160 0d83a4a5b9512ff7306f9eecb4eb580b999c40d9 ChangeLog 4158
-SHA256 ade8895c76251251113a9bb30a60469753ddb50dcab9cbbd92a2b6e3275566bd ChangeLog 4158
-MISC metadata.xml 621 RMD160 1de22f56127ab312cb1807ecd3db45ef8d46b86c SHA1 a1b7950cf62aa6751b5221f2a1809918c64b1589 SHA256 7eb7c51e4a14edc2c6f0715e525e00c7945691aa6a5493d2f0656753d661d0e0
-MD5 f5ab7a31c83d8aae41eebac1c29329ff metadata.xml 621
-RMD160 1de22f56127ab312cb1807ecd3db45ef8d46b86c metadata.xml 621
-SHA256 7eb7c51e4a14edc2c6f0715e525e00c7945691aa6a5493d2f0656753d661d0e0 metadata.xml 621
+MISC ChangeLog 4474 RMD160 8d3701709aaa01d3be57be3fdeeb4a2328886f8f SHA1 e902b754a2c9a71439ac17fae8545417515d137d SHA256 2b4bbe73d8015d32ab2ebbe5eaf6165759b35a76098373f3c1d3cbc29d15ca92
+MD5 1bb5511199c259823789abd1a9fe8d3a ChangeLog 4474
+RMD160 8d3701709aaa01d3be57be3fdeeb4a2328886f8f ChangeLog 4474
+SHA256 2b4bbe73d8015d32ab2ebbe5eaf6165759b35a76098373f3c1d3cbc29d15ca92 ChangeLog 4474
+MISC metadata.xml 710 RMD160 886aee2e0f5caa3d1c48daf0af7bef106c11a87b SHA1 577dd460a6f15f5ad111b93ce181b449da1f7ae5 SHA256 60196eb6cbbcb6926cba32eadc9350cd4c536f7b2a62936d9100aab2355e0814
+MD5 5be7208eacb14b197c97ef6fc4aa67c7 metadata.xml 710
+RMD160 886aee2e0f5caa3d1c48daf0af7bef106c11a87b metadata.xml 710
+SHA256 60196eb6cbbcb6926cba32eadc9350cd4c536f7b2a62936d9100aab2355e0814 metadata.xml 710
 MD5 904f54db4b073dcaefd049289f5a31b3 files/digest-arpwatch-2.1.11-r1 500
 RMD160 9a0323cacc0adc4ea998765e18269d6a9f28db61 files/digest-arpwatch-2.1.11-r1 500
 SHA256 8e7bae4cb9ed2cd063f060c3b2198928bbd0dad7f41c3c07e1dc8b402020ccc6 files/digest-arpwatch-2.1.11-r1 500
@@ -55,10 +65,6 @@ SHA256 8a309bbe1ee86d3a835e91913de29ffe79fee2b2502d472340f78b430fd634fa files/di
 MD5 e8b4ce1fba55a4d3d27eb18551af9929 files/digest-arpwatch-2.1.15 575
 RMD160 1c4d4a6c0f7e228d58d879652d5e95a373d0c6f1 files/digest-arpwatch-2.1.15 575
 SHA256 1d42e291fa15fe08fd805ba3e221103cd2e06f0ba8e5dc9ddc3b4d7c27a117d2 files/digest-arpwatch-2.1.15 575
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFFCdeVKRy60XGEcJIRAi/xAJ9N8YSnrFZfXg1b+rZB2ASHkx76LACgi8iy
-o7P8FKqVOxpIf58HIkRX+vE=
-=6HKQ
------END PGP SIGNATURE-----
+MD5 cef62c82224a65ed9aff6c02cc05dc8e files/digest-arpwatch-2.1.15-r1 503
+RMD160 2a282cf004c43631373379e30d65122427a8712f files/digest-arpwatch-2.1.15-r1 503
+SHA256 ec6103037d9a5fe7704c263122889a3dce11e90bfea04e9cc20a8b4b0b1aed09 files/digest-arpwatch-2.1.15-r1 503
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r1.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r1.ebuild
new file mode 100644
index 000000000000..7740bd0e5b2a
--- /dev/null
+++ b/net-analyzer/arpwatch/arpwatch-2.1.15-r1.ebuild
@@ -0,0 +1,81 @@
+# 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-r1.ebuild,v 1.1 2006/09/23 19:10:29 pva Exp $
+
+inherit eutils versionator
+
+PATCH_VER="0.1"
+
+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/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
diff --git a/net-analyzer/arpwatch/metadata.xml b/net-analyzer/arpwatch/metadata.xml
index 4fc697499bf6..491bce7b2309 100644
--- a/net-analyzer/arpwatch/metadata.xml
+++ b/net-analyzer/arpwatch/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
+	<maintainer>
+		<email>pva@gentoo.org</email>
+		<name>Peter Volkov</name>
+	</maintainer>
 	<longdescription lang="en">
 		The arpwatch package contains arpwatch and arpsnmp. Arpwatch and arpsnmp
 		are both network monitoring tools. Both utilities monitor Ethernet or