net-analyzer/pmacct: Improve init script for bug #172281

Package-Manager: portage-2.1.2.2

diff --git a/net-analyzer/pmacct/ChangeLog b/net-analyzer/pmacct/ChangeLog
index b56dbbca3543832e7d394b83e6770765b6f63a93..58351aa303c3a882e7e4d222b59d8a4145e23d1d 100644 (file)
--- a/net-analyzer/pmacct/ChangeLog
+++ b/net-analyzer/pmacct/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/pmacct
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.47 2007/03/20 18:50:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.48 2007/03/28 21:17:57 cedk Exp $
+
+  28 Mar 2007; Cedric Krier <cedk@gentoo.org> files/pmacctd-conf.d,
+  files/pmacctd-init.d:
+  Improve init script for bug #172281
 
   20 Mar 2007; Raúl Porcel <armin76@gentoo.org> pmacct-0.11.3.ebuild:
   x86 stable

diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 9ea2dca55a5cfec41f6726d8982656f95538b061..b03bc8d23d3b9916811fd12202411cdb872c94be 100644 (file)
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,11 +1,11 @@
-AUX pmacctd-conf.d 313 RMD160 f7cebefa18a0d11e3493d5d700fc599454624204 SHA1 78e6de40d1c6d0d6206b406ec46ae945b609565e SHA256 8be76ba0038a537da2a693f4fab64e2565b164833d844e1404cc07b2a3731eb1
-MD5 50333f1c79a80df31266ce7235cbf36c files/pmacctd-conf.d 313
-RMD160 f7cebefa18a0d11e3493d5d700fc599454624204 files/pmacctd-conf.d 313
-SHA256 8be76ba0038a537da2a693f4fab64e2565b164833d844e1404cc07b2a3731eb1 files/pmacctd-conf.d 313
-AUX pmacctd-init.d 869 RMD160 b8b35da9dddb509cc2e84e0550eeba5e95215093 SHA1 1f9430f600f2dbd33242e1b8aa0dc296d5ce134a SHA256 b0908c0ca60c3692b8e65b42543eb86a240e6e77550a8c878a7cce0a1aee1ca0
-MD5 2afa8e97312b03f3e119c0befed9e7d3 files/pmacctd-init.d 869
-RMD160 b8b35da9dddb509cc2e84e0550eeba5e95215093 files/pmacctd-init.d 869
-SHA256 b0908c0ca60c3692b8e65b42543eb86a240e6e77550a8c878a7cce0a1aee1ca0 files/pmacctd-init.d 869
+AUX pmacctd-conf.d 266 RMD160 00d82dca28a19b81653208976df68f69b5609a80 SHA1 7f1dc7f56dc3c5cd143c8120d8f919a5616605a7 SHA256 341dee2b5e870747a39b8639efec2d8e37133251be0f6a5243629b6440991f34
+MD5 819c72826692fba500c1c8c49a6901da files/pmacctd-conf.d 266
+RMD160 00d82dca28a19b81653208976df68f69b5609a80 files/pmacctd-conf.d 266
+SHA256 341dee2b5e870747a39b8639efec2d8e37133251be0f6a5243629b6440991f34 files/pmacctd-conf.d 266
+AUX pmacctd-init.d 658 RMD160 acaae5e5c05408dc49f8f431789c9be9c4b967f8 SHA1 feeaa43694afe3ab6ce10f196892cba822826882 SHA256 41f32bded026e204040a4ba8bf75ed30c564821c67697d6a46a35863fbfbb69b
+MD5 f62e6d7f143d7c6235c689ef8b7a3536 files/pmacctd-init.d 658
+RMD160 acaae5e5c05408dc49f8f431789c9be9c4b967f8 files/pmacctd-init.d 658
+SHA256 41f32bded026e204040a4ba8bf75ed30c564821c67697d6a46a35863fbfbb69b files/pmacctd-init.d 658
 DIST pmacct-0.11.2.tar.gz 411711 RMD160 99bead4c09b060854bff72b18ac7150097e78643 SHA1 c66ba52b32d4c7502edc171d4a90dfb34814e174 SHA256 6d8346944c987a2ec9e6b29cbbc2a886007a2535b9d506051ef6afe96faac625
 DIST pmacct-0.11.3.tar.gz 417160 RMD160 b8192ece79b0a1697237700843972bd44f728be0 SHA1 9811465d7820127911df345a94bd7c934d6dad0e SHA256 ff591cb5e1b17ab6f148d10534164307c8f6309b46067bc9be8a32f086a8388d
 DIST pmacct-0.9.5.tar.gz 304129 RMD160 529af5e3078e7360f6b0226011b354065760d8dd SHA1 34ba2a38440a0b21318a307e40e5e99a566cbc3a SHA256 fd288d73f299852d11d20f2f85340dc878f11360ae0970464f72866162a9d635
@@ -21,10 +21,10 @@ EBUILD pmacct-0.9.5.ebuild 1560 RMD160 2c82046cfd9af4fa03a1475b261a203e046415dd
 MD5 d9ddb3103f7347d411be2eacfc49f9fb pmacct-0.9.5.ebuild 1560
 RMD160 2c82046cfd9af4fa03a1475b261a203e046415dd pmacct-0.9.5.ebuild 1560
 SHA256 e74176e8da1d29a58c76fae9e0182ad24788bdeac401ae4c61d72c3011663ec3 pmacct-0.9.5.ebuild 1560
-MISC ChangeLog 7550 RMD160 d4b3d014c680f94f6580e79841ed8ce968558c04 SHA1 e7cf22764bc5c665465ada5ca4da53ab539df616 SHA256 032f787b290c57770ab464b112f3c30e87ad9c0a4a6fc5ab32c52a5af505a986
-MD5 d9629a49d9c5062fba893cf1f1b9a909 ChangeLog 7550
-RMD160 d4b3d014c680f94f6580e79841ed8ce968558c04 ChangeLog 7550
-SHA256 032f787b290c57770ab464b112f3c30e87ad9c0a4a6fc5ab32c52a5af505a986 ChangeLog 7550
+MISC ChangeLog 7678 RMD160 ca7476aec8869677a7e2c46acb9489cec7e738ba SHA1 620b0d55ca76dcc6cb3a7322c59d9e2d76fd6b0e SHA256 776a767b4d4a35372fa8d3f8bd4d456fa386c2027ac5894f8a9cc1908840c3c0
+MD5 6497d196e588fa560948a55257ed40b1 ChangeLog 7678
+RMD160 ca7476aec8869677a7e2c46acb9489cec7e738ba ChangeLog 7678
+SHA256 776a767b4d4a35372fa8d3f8bd4d456fa386c2027ac5894f8a9cc1908840c3c0 ChangeLog 7678
 MISC metadata.xml 243 RMD160 0fd9040526fc868cc4340ad66be2d69df7d829d6 SHA1 4c7c900b208f9f6ac207623cd58132d9df589f90 SHA256 49325dc5114ba3e0a5fa5dda3ddd35a605256831212338ae5ea47523f4593bb5
 MD5 808a9a788ae7955af0a3c442cafee866 metadata.xml 243
 RMD160 0fd9040526fc868cc4340ad66be2d69df7d829d6 metadata.xml 243

diff --git a/net-analyzer/pmacct/files/pmacctd-conf.d b/net-analyzer/pmacct/files/pmacctd-conf.d
index bf68484c872dc09e7012b792530214d13c4db617..b360d5d5a97faba0e771cca7aa254543cdee9960 100644 (file)
--- a/net-analyzer/pmacct/files/pmacctd-conf.d
+++ b/net-analyzer/pmacct/files/pmacctd-conf.d
@@ -1,9 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/files/pmacctd-conf.d,v 1.2 2004/07/14 23:08:10 agriffis Exp $
-
-# Interface to listen on
-INTERFACE="eth0"
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/files/pmacctd-conf.d,v 1.3 2007/03/28 21:17:57 cedk Exp $
 
 # Other options to pass to pmacctd
 #OPTS=""

diff --git a/net-analyzer/pmacct/files/pmacctd-init.d b/net-analyzer/pmacct/files/pmacctd-init.d
index 7e04273c7f32c09748bb84403ad80a7f6d095773..e24b097c17670c116d83f3d84d5c9482136b3c20 100644 (file)
--- a/net-analyzer/pmacct/files/pmacctd-init.d
+++ b/net-analyzer/pmacct/files/pmacctd-init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/files/pmacctd-init.d,v 1.2 2004/07/14 23:08:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/files/pmacctd-init.d,v 1.3 2007/03/28 21:17:57 cedk Exp $
 
 depend() {
        need net
@@ -18,13 +18,8 @@ start() {
        chekconfig || return 1
        ebegin "Starting pmacctd"
        start-stop-daemon --start --exec /usr/sbin/pmacctd \
-               -- -D -f /etc/pmacctd.conf -i ${INTERFACE} ${OPTS}
-
-       # pmacctd apparently always returns a value > 0 when launched,
-       # and start-stop-daemon sees that an error an therfore always
-       # return 1. So we have to assume everything whent as expected.
-       
-       eend
+               -- -D -f /etc/pmacctd.conf ${OPTS}
+       eend $?
 }
 
 stop() {