Fixed permition problem reported in bug #171989. Added pid patch to fix start/stop...

Package-Manager: portage-2.1.2.2

diff --git a/net-analyzer/arpwatch/ChangeLog b/net-analyzer/arpwatch/ChangeLog
index 65384bc198a2577a031022879c687948afec831a..86da912d369e8e12616957a0df250d4b51637091 100644 (file)
--- a/net-analyzer/arpwatch/ChangeLog
+++ b/net-analyzer/arpwatch/ChangeLog
@@ -1,6 +1,13 @@
 # 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.39 2007/02/01 21:09:13 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/ChangeLog,v 1.40 2007/03/27 19:33:47 pva Exp $
+
+*arpwatch-2.1.15-r4 (27 Mar 2007)
+
+  27 Mar 2007; <pva@gentoo.org> -files/arpwatch.confd-2,
+  files/arpwatch.init-2, +arpwatch-2.1.15-r4.ebuild:
+  Fixed permition problem reported in bug #171989. Added pid patch to fix
+  start/stop problem.
 
   01 Feb 2007; Markus Ullmann <jokey@gentoo.org> files/arpwatch.confd,
   files/arpwatch.init, -arpwatch-2.1.11-r1.ebuild,

diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index 7b8f4ae8077e2d088aa9031fa19d0e760a624dea..54741fba7df621f628247a65023e0b09780ceefa 100644 (file)
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -1,32 +1,30 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX arpwatch.confd 255 RMD160 7da14036617ccd32f8a8b2b50487b56446153f4c SHA1 9ca8f47b6957fe46b51fcab80bb0c49557435d5b SHA256 d45291719550899a6c8be2b1a4c6a416cf894b30b3be654adf7182151f63b77f
 MD5 ee7d2c3e5a7af87e4b18a1e23183c88d files/arpwatch.confd 255
 RMD160 7da14036617ccd32f8a8b2b50487b56446153f4c files/arpwatch.confd 255
 SHA256 d45291719550899a6c8be2b1a4c6a416cf894b30b3be654adf7182151f63b77f files/arpwatch.confd 255
-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 1006 RMD160 b614b20f56f84601638f4ea3f62bb21f5c423c94 SHA1 140a89d24f6b6f8b34b3cfec75daa68541bfc307 SHA256 4d5c827ea3f592380c52870d957d23c539254be62cfc0de917f9d511a7c2408b
 MD5 406db1599d9945f5e6f259c203b9511c files/arpwatch.init 1006
 RMD160 b614b20f56f84601638f4ea3f62bb21f5c423c94 files/arpwatch.init 1006
 SHA256 4d5c827ea3f592380c52870d957d23c539254be62cfc0de917f9d511a7c2408b files/arpwatch.init 1006
-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
+AUX arpwatch.init-2 1105 RMD160 d7a87c04d89bbf50408a3e3032d06f4030063be8 SHA1 955514265bba8bb5f174ebe45c630e0636370e95 SHA256 ca5e22f422efd7fd3381e6aa8e0619dc22a45b5ad287fa8ab252a2e2306c7078
+MD5 752d993c043f97261fcf08abf6314c6d files/arpwatch.init-2 1105
+RMD160 d7a87c04d89bbf50408a3e3032d06f4030063be8 files/arpwatch.init-2 1105
+SHA256 ca5e22f422efd7fd3381e6aa8e0619dc22a45b5ad287fa8ab252a2e2306c7078 files/arpwatch.init-2 1105
 DIST arpwatch-2.1a15.tar.gz 202729 RMD160 a27ee53275dcec3cafb85eb3df2451d42ec32b0c SHA1 9dffaec0f132e5bb7aedfc840c5c67068bfbce69 SHA256 c1df9737e208a96a61fa92ddad83f4b4d9be66f8992f3c917e9edf4b05ff5898
 DIST arpwatch-patchset-0.3.tbz2 15934 RMD160 5e21ac57fa5beca751d1d5a42ea3632e70ee953e SHA1 43952e686965211eb930bcd82bf54d75012883fb SHA256 7721f983ea21f5e0bfb265982e59d0de9d76f1021abf2c2e359f91805922bfe3
+DIST arpwatch-patchset-0.4.tbz2 16350 RMD160 9e9ae77ef38591af72687fa7014b4c56fc4c4d2c SHA1 009eaa110fc93b40aa91c838b57b71a071210692 SHA256 f49deed64301078a00881fa9c27bb3a4116b9096cfe880f5a0bcc9913b439a18
 EBUILD arpwatch-2.1.15-r3.ebuild 2107 RMD160 334fd542bab6f4a8df564062a9747a6ac1f15806 SHA1 b6b6cf53d689abf75a016ae456da7d934e34ad1f SHA256 461cfc6c18343b8a2d694221adcf262b7b9d52f3d95d27f55bc2306e69b1d451
 MD5 030bbb2603f8d3402736aeded7cb4490 arpwatch-2.1.15-r3.ebuild 2107
 RMD160 334fd542bab6f4a8df564062a9747a6ac1f15806 arpwatch-2.1.15-r3.ebuild 2107
 SHA256 461cfc6c18343b8a2d694221adcf262b7b9d52f3d95d27f55bc2306e69b1d451 arpwatch-2.1.15-r3.ebuild 2107
-MISC ChangeLog 5998 RMD160 f6b1cb49f9567583bf96522c567fa2e7a517a9a1 SHA1 84521d716543664e44ec5b74d773b687537b7518 SHA256 16d96d21cd4efa0fbb933453685af0d55b5e15ae9244a41cebfb3036837249f6
-MD5 faa18010ca9451acd1289a19a058db3e ChangeLog 5998
-RMD160 f6b1cb49f9567583bf96522c567fa2e7a517a9a1 ChangeLog 5998
-SHA256 16d96d21cd4efa0fbb933453685af0d55b5e15ae9244a41cebfb3036837249f6 ChangeLog 5998
+EBUILD arpwatch-2.1.15-r4.ebuild 2107 RMD160 a7540de6f589e46a1cb2712cc249848d6e203f04 SHA1 f80325eb64482535e2aa3bb3380ea28db22859ed SHA256 4d26c398c6f56ad181a79816556922a5456086af14b9437c30c42de28293d074
+MD5 d5b2e214a2108bd8d1191c60c3eee21a arpwatch-2.1.15-r4.ebuild 2107
+RMD160 a7540de6f589e46a1cb2712cc249848d6e203f04 arpwatch-2.1.15-r4.ebuild 2107
+SHA256 4d26c398c6f56ad181a79816556922a5456086af14b9437c30c42de28293d074 arpwatch-2.1.15-r4.ebuild 2107
+MISC ChangeLog 6238 RMD160 32b1ed3f542f2d59519ce533d26b069edcb0bdff SHA1 7eceb882cd68e69dac1724319c1089826d95697e SHA256 bd1a4a0eea46ae976b1814b68aaa2b9d75141382fa575a530e23b9bb70e063fe
+MD5 e4803f0b429cada162e99ce8b7d79470 ChangeLog 6238
+RMD160 32b1ed3f542f2d59519ce533d26b069edcb0bdff ChangeLog 6238
+SHA256 bd1a4a0eea46ae976b1814b68aaa2b9d75141382fa575a530e23b9bb70e063fe ChangeLog 6238
 MISC metadata.xml 710 RMD160 886aee2e0f5caa3d1c48daf0af7bef106c11a87b SHA1 577dd460a6f15f5ad111b93ce181b449da1f7ae5 SHA256 60196eb6cbbcb6926cba32eadc9350cd4c536f7b2a62936d9100aab2355e0814
 MD5 5be7208eacb14b197c97ef6fc4aa67c7 metadata.xml 710
 RMD160 886aee2e0f5caa3d1c48daf0af7bef106c11a87b metadata.xml 710
@@ -34,10 +32,6 @@ SHA256 60196eb6cbbcb6926cba32eadc9350cd4c536f7b2a62936d9100aab2355e0814 metadata
 MD5 374e59ae14b38c9bfafe88c19ba7f4e8 files/digest-arpwatch-2.1.15-r3 503
 RMD160 b740c7ece11d2de3cbeb9744d7751211d8987854 files/digest-arpwatch-2.1.15-r3 503
 SHA256 c8d0bcbe625c4b707591bc2e74117dbde9d7dfe3c962552c7ade8004a178674f files/digest-arpwatch-2.1.15-r3 503
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFwlbhz974XjDVpbkRAih4AJ9BlJkIjpM37blXnml4nMlc4lE0XgCgrnG0
-a60oghDu/t4UgLUQBEK1vwc=
-=Q4Q8
------END PGP SIGNATURE-----
+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

diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r4.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r4.ebuild
new file mode 100644 (file)
index 0000000..72db8dc
--- /dev/null
+++ b/net-analyzer/arpwatch/arpwatch-2.1.15-r4.ebuild
@@ -0,0 +1,81 @@
+# 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.1 2007/03/27 19:33:47 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}"
+
+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_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 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
deleted file mode 100644 (file)
index 960454e..0000000
--- a/net-analyzer/arpwatch/files/arpwatch.confd-2
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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
index 15ae358e6bc97c7b8c89db843e0c660c96b0973a..4929e6278c0198573bf7cd9cf94b578dc9b5ef55 100644 (file)
--- a/net-analyzer/arpwatch/files/arpwatch.init-2
+++ b/net-analyzer/arpwatch/files/arpwatch.init-2
@@ -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-2,v 1.1 2006/09/23 19:10:29 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/files/arpwatch.init-2,v 1.2 2007/03/27 19:33:47 pva Exp $
 
 depend() {
        need net
@@ -16,10 +16,11 @@ start() {
 
                if [ -z ${ARPUSER} ]; then
                        start-stop-daemon --start --quiet --pidfile=/var/run/arpwatch.${IFACE}.pid --exec \
-                       /usr/sbin/arpwatch -- -i ${IFACE} -f ${DATAFILE} ${OPTIONS}
+                       /usr/sbin/arpwatch -- -i ${IFACE} -f ${DATAFILE} -P /var/run/arpwatch.${IFACE}.pid ${OPTIONS}
                else
+                       chown ${ARPUSER} ${DATAFILE}
                        start-stop-daemon --start --quiet --pidfile=/var/run/arpwatch.${IFACE}.pid --exec \
-                       /usr/sbin/arpwatch -- -i $IFACE -u ${ARPUSER} -f ${DATAFILE} ${OPTIONS}
+                       /usr/sbin/arpwatch -- -i $IFACE -u ${ARPUSER} -f ${DATAFILE} -P /var/run/arpwatch.${IFACE}.pid ${OPTIONS}
                fi
                eend $?
        done

diff --git a/net-analyzer/arpwatch/files/digest-arpwatch-2.1.15-r4 b/net-analyzer/arpwatch/files/digest-arpwatch-2.1.15-r4
new file mode 100644 (file)
index 0000000..aeac533
--- /dev/null
+++ b/net-analyzer/arpwatch/files/digest-arpwatch-2.1.15-r4
@@ -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