Fixed bug #198345. Now pkg_config is removed completly and run arpwatch as unprivileged user by default. Thank Richard Hartmann <rick4711 AT myrealbox.com> for report.

Package-Manager: portage-2.1.3.18

6 files changed, 103 insertions, 29 deletions

diff --git a/net-analyzer/arpwatch/ChangeLog b/net-analyzer/arpwatch/ChangeLog
index a4a7120a0da1..015cec30fede 100644
--- a/net-analyzer/arpwatch/ChangeLog
+++ b/net-analyzer/arpwatch/ChangeLog
@@ -1,6 +1,14 @@
 # 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.46 2007/06/02 22:37:16 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/ChangeLog,v 1.47 2007/11/07 17:05:50 pva Exp $
+
+*arpwatch-2.1.15-r5 (07 Nov 2007)
+
+  07 Nov 2007; <pva@gentoo.org> files/arpwatch.confd,
+  arpwatch-2.1.15-r4.ebuild, +arpwatch-2.1.15-r5.ebuild:
+  Fixed bug #198345. Now pkg_config is removed completly and run arpwatch as
+  unprivileged user by default. Thank Richard Hartmann <rick4711 AT
+  myrealbox.com> for report.
 
   02 Jun 2007; Markus Ullmann <jokey@gentoo.org> -files/arpwatch.init-2,
   files/arpwatch.confd, -files/arpwatch.init, +files/arpwatch.initd,
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index 2636c5333390..aecd8609c6c2 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -1,24 +1,25 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX arpwatch.confd 397 RMD160 3aaca5de34fbe828dbb4828d198ecd1d4e307162 SHA1 54919e3a923c594e1c977a3efdec34c6e9809607 SHA256 05b8bb65fef34f0189746264cf4b701c468a4f70645e4b1aabbeb633780defab
-MD5 50454a780237b61440635d08ed07a34d files/arpwatch.confd 397
-RMD160 3aaca5de34fbe828dbb4828d198ecd1d4e307162 files/arpwatch.confd 397
-SHA256 05b8bb65fef34f0189746264cf4b701c468a4f70645e4b1aabbeb633780defab files/arpwatch.confd 397
+AUX arpwatch.confd 270 RMD160 040c4ade1f157b38fdb66d8e8cc08e3b6484ef18 SHA1 3b590f1851cbd5d684b6e836757367446fddfaf4 SHA256 bf36f7b717291733787bd00ac22d49dafc251cd50fcc27266d56d51364fd62fa
+MD5 865d95011693028f27c04efa6f9426b0 files/arpwatch.confd 270
+RMD160 040c4ade1f157b38fdb66d8e8cc08e3b6484ef18 files/arpwatch.confd 270
+SHA256 bf36f7b717291733787bd00ac22d49dafc251cd50fcc27266d56d51364fd62fa files/arpwatch.confd 270
 AUX arpwatch.initd 1106 RMD160 a9db01d5b2157742d6f9d48c157718e158017cb4 SHA1 8cafd84754f8e32a7fcec4180e79e3b62d4964ec SHA256 c336b18759d188ef6c77e2177fdfbf4ed5c488f04fc2357c556ff406d2eeea1d
 MD5 e65866b9c08fc503975440c49cf21247 files/arpwatch.initd 1106
 RMD160 a9db01d5b2157742d6f9d48c157718e158017cb4 files/arpwatch.initd 1106
 SHA256 c336b18759d188ef6c77e2177fdfbf4ed5c488f04fc2357c556ff406d2eeea1d files/arpwatch.initd 1106
 DIST arpwatch-2.1a15.tar.gz 202729 RMD160 a27ee53275dcec3cafb85eb3df2451d42ec32b0c SHA1 9dffaec0f132e5bb7aedfc840c5c67068bfbce69 SHA256 c1df9737e208a96a61fa92ddad83f4b4d9be66f8992f3c917e9edf4b05ff5898
 DIST arpwatch-patchset-0.4.tbz2 16350 RMD160 9e9ae77ef38591af72687fa7014b4c56fc4c4d2c SHA1 009eaa110fc93b40aa91c838b57b71a071210692 SHA256 f49deed64301078a00881fa9c27bb3a4116b9096cfe880f5a0bcc9913b439a18
-EBUILD arpwatch-2.1.15-r4.ebuild 1785 RMD160 9283764e16a7492f337715124b7d134a6d9f22a0 SHA1 7efc857a718f3c7e6de4405fcf23fda0722e8a33 SHA256 871c3c31bbd2469040e500ecc1bdbcacef27d6614381ef152b09e9ddc060e154
-MD5 c1e6fba0580c76bb99e1c78d30edb304 arpwatch-2.1.15-r4.ebuild 1785
-RMD160 9283764e16a7492f337715124b7d134a6d9f22a0 arpwatch-2.1.15-r4.ebuild 1785
-SHA256 871c3c31bbd2469040e500ecc1bdbcacef27d6614381ef152b09e9ddc060e154 arpwatch-2.1.15-r4.ebuild 1785
-MISC ChangeLog 7014 RMD160 60cdde9fa577170ae293913c805baaa644674a8f SHA1 b367248277e9f36f267d2ac8a2b896ff0a078e61 SHA256 1f85f0ddfab96be67c34a566b9019f4d48402acdb23a9a31e62fe097bdcaf933
-MD5 74f85e738afb8e500d4905ba6b30132d ChangeLog 7014
-RMD160 60cdde9fa577170ae293913c805baaa644674a8f ChangeLog 7014
-SHA256 1f85f0ddfab96be67c34a566b9019f4d48402acdb23a9a31e62fe097bdcaf933 ChangeLog 7014
+EBUILD arpwatch-2.1.15-r4.ebuild 1781 RMD160 1c9ef96622b2be7898082075992ee1cc2d386afe SHA1 587242df0d1b5f69396c0ef338f6e756d0d13b53 SHA256 948fe1a18fcb90f7cd9200a9a2187b51b3c14582cea1763b2c71930add18eb64
+MD5 f9ffc9fb881aa85a0c678b0403db20ae arpwatch-2.1.15-r4.ebuild 1781
+RMD160 1c9ef96622b2be7898082075992ee1cc2d386afe arpwatch-2.1.15-r4.ebuild 1781
+SHA256 948fe1a18fcb90f7cd9200a9a2187b51b3c14582cea1763b2c71930add18eb64 arpwatch-2.1.15-r4.ebuild 1781
+EBUILD arpwatch-2.1.15-r5.ebuild 1772 RMD160 a95ba8b37e5ed3f3f505354a242f6cb56771bf75 SHA1 d3a4a1266e08cdc6b7f6fc0e0f2e34d2684c8381 SHA256 2ea726086e2c4c568d094e62d56a0324d35594c6a04cc18102f19595f8494b49
+MD5 34a189d923bff7cb6c1f64e090295a68 arpwatch-2.1.15-r5.ebuild 1772
+RMD160 a95ba8b37e5ed3f3f505354a242f6cb56771bf75 arpwatch-2.1.15-r5.ebuild 1772
+SHA256 2ea726086e2c4c568d094e62d56a0324d35594c6a04cc18102f19595f8494b49 arpwatch-2.1.15-r5.ebuild 1772
+MISC ChangeLog 7333 RMD160 c37fe3b21c1804dcf998ba8441d81eb3882fc14f SHA1 4429e9bdadcdbfc5dc47d9b1f4bd5ed9f17fd0b9 SHA256 fce84116993d531d3d89ac161cec57b4459785f9876c0bdc609ee7463ae29467
+MD5 500e0385ceb0966285a1c640a571c1c1 ChangeLog 7333
+RMD160 c37fe3b21c1804dcf998ba8441d81eb3882fc14f ChangeLog 7333
+SHA256 fce84116993d531d3d89ac161cec57b4459785f9876c0bdc609ee7463ae29467 ChangeLog 7333
 MISC metadata.xml 710 RMD160 886aee2e0f5caa3d1c48daf0af7bef106c11a87b SHA1 577dd460a6f15f5ad111b93ce181b449da1f7ae5 SHA256 60196eb6cbbcb6926cba32eadc9350cd4c536f7b2a62936d9100aab2355e0814
 MD5 5be7208eacb14b197c97ef6fc4aa67c7 metadata.xml 710
 RMD160 886aee2e0f5caa3d1c48daf0af7bef106c11a87b metadata.xml 710
@@ -26,10 +27,6 @@ SHA256 60196eb6cbbcb6926cba32eadc9350cd4c536f7b2a62936d9100aab2355e0814 metadata
 MD5 abe5d4b3782eed39b55a75ec3e8a2c4f files/digest-arpwatch-2.1.15-r4 503
 RMD160 19aa0cc8af201bda117843c673cbb0302f6db534 files/digest-arpwatch-2.1.15-r4 503
 SHA256 29091799f2ad72bd873679570c2949af516e55e96f4fdae602f1ddbbc0848482 files/digest-arpwatch-2.1.15-r4 503
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGYfElz974XjDVpbkRAtBtAJ0VcJOQhhBLYa5CzhTLKyl+ShzryACcDexq
-xPtiWd/FfVR7e+Lz53YlB7s=
-=SKXT
------END PGP SIGNATURE-----
+MD5 abe5d4b3782eed39b55a75ec3e8a2c4f files/digest-arpwatch-2.1.15-r5 503
+RMD160 19aa0cc8af201bda117843c673cbb0302f6db534 files/digest-arpwatch-2.1.15-r5 503
+SHA256 29091799f2ad72bd873679570c2949af516e55e96f4fdae602f1ddbbc0848482 files/digest-arpwatch-2.1.15-r5 503
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r4.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r4.ebuild
index fc8b1a1a6632..c28c4e26b97a 100644
--- a/net-analyzer/arpwatch/arpwatch-2.1.15-r4.ebuild
+++ b/net-analyzer/arpwatch/arpwatch-2.1.15-r4.ebuild
@@ -1,6 +1,6 @@
 # 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.8 2007/06/02 22:37:16 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/arpwatch-2.1.15-r4.ebuild,v 1.9 2007/11/07 17:05:50 pva Exp $
 
 inherit eutils versionator
 
@@ -23,7 +23,7 @@ DEPEND="virtual/libpcap
 RDEPEND="${DEPEND}
 		selinux? ( sec-policy/selinux-arpwatch )"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r5.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r5.ebuild
new file mode 100644
index 000000000000..fdc8edac268f
--- /dev/null
+++ b/net-analyzer/arpwatch/arpwatch-2.1.15-r5.ebuild
@@ -0,0 +1,65 @@
+# 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-r5.ebuild,v 1.1 2007/11/07 17:05:50 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}
+
+pkg_preinst() {
+	enewuser arpwatch
+}
+
+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_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.initd arpwatch
+	newconfd "${FILESDIR}"/arpwatch.confd arpwatch
+}
+
+pkg_postinst() {
+	# Workaround bug #141619 put this in src_install when bug'll be fixed.
+	chown arpwatch:0 "${ROOT}var/lib/arpwatch"
+
+	elog "For security reasons arpwatch by default runs as an unprivileged user."
+	ewarn "Note: some scripts require snmpwalk utility from net-analyzer/net-snmp"
+}
diff --git a/net-analyzer/arpwatch/files/arpwatch.confd b/net-analyzer/arpwatch/files/arpwatch.confd
index dcf11eac077a..98abe0417740 100644
--- a/net-analyzer/arpwatch/files/arpwatch.confd
+++ b/net-analyzer/arpwatch/files/arpwatch.confd
@@ -1,6 +1,5 @@
 # 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"
@@ -8,6 +7,5 @@ IFACES="eth0"
 # Additional options to pass to arpwatch.
 OPTIONS="-N -p"
 
-# Uncomment this line if you wish arpwatch to drop privileges.
-# Don't forget to adjust permissions on /var/lib/arpwarch
-#ARPUSER="arpwatch"
+# Comment this line if you wish arpwatch to run as root user (not recommended)
+ARPUSER="arpwatch"
diff --git a/net-analyzer/arpwatch/files/digest-arpwatch-2.1.15-r5 b/net-analyzer/arpwatch/files/digest-arpwatch-2.1.15-r5
new file mode 100644
index 000000000000..aeac5338f385
--- /dev/null
+++ b/net-analyzer/arpwatch/files/digest-arpwatch-2.1.15-r5
@@ -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