Fixed inability to stop pmacctd, bug #234051 thank Patrick for report and fix.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.26-openvz.git-35f41f1 i686

4 files changed, 95 insertions, 2 deletions

diff --git a/net-analyzer/pmacct/ChangeLog b/net-analyzer/pmacct/ChangeLog
index 771bf3e88c14..53c72057b810 100644
--- a/net-analyzer/pmacct/ChangeLog
+++ b/net-analyzer/pmacct/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/pmacct
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.55 2008/08/04 19:50:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.56 2008/11/16 16:00:25 pva Exp $
+
+*pmacct-0.11.5-r1 (16 Nov 2008)
+
+  16 Nov 2008; Peter Volkov <pva@gentoo.org> +files/pmacctd-init.d.1,
+  +pmacct-0.11.5-r1.ebuild:
+  Fixed inability to stop pmacctd, bug #234051 thank Patrick for report and
+  fix.
 
   04 Aug 2008; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Describe local USE flags for GLEP 56.
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index f3a16b169da6..73b7b1765b79 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,10 +1,12 @@
 AUX pmacctd-conf.d 266 RMD160 00d82dca28a19b81653208976df68f69b5609a80 SHA1 7f1dc7f56dc3c5cd143c8120d8f919a5616605a7 SHA256 341dee2b5e870747a39b8639efec2d8e37133251be0f6a5243629b6440991f34
 AUX pmacctd-init.d 658 RMD160 acaae5e5c05408dc49f8f431789c9be9c4b967f8 SHA1 feeaa43694afe3ab6ce10f196892cba822826882 SHA256 41f32bded026e204040a4ba8bf75ed30c564821c67697d6a46a35863fbfbb69b
+AUX pmacctd-init.d.1 746 RMD160 5fa0cfaca75a4a5c158dff886e3de7ac6c784882 SHA1 a6ff4af1fb8551a042ff97038f57395412efb825 SHA256 8612da190655a67e385676e38124ef58c6623b446d41beea4f7b2d211c63f2f9
 DIST pmacct-0.11.3.tar.gz 417160 RMD160 b8192ece79b0a1697237700843972bd44f728be0 SHA1 9811465d7820127911df345a94bd7c934d6dad0e SHA256 ff591cb5e1b17ab6f148d10534164307c8f6309b46067bc9be8a32f086a8388d
 DIST pmacct-0.11.4.tar.gz 422189 RMD160 ad8aa10f44ade158435ce81e89e57463b8142bb0 SHA1 c74e4db567e87f845f2118e67b189687bd3544c8 SHA256 34c3870eb2acc63173b95c9a08128592b1ee850dd88e0cbdf2f9e0b9fa3f87c9
 DIST pmacct-0.11.5.tar.gz 423251 RMD160 4f54c8102bc1a759beddf749667839d420783767 SHA1 f4ca3086153094a1335d059b0aee9015f0079bf9 SHA256 d26b98e8a8cb670222983df46746d860e27beca032b5feff6439c3f3c0aad752
 EBUILD pmacct-0.11.3.ebuild 1579 RMD160 3ca63393cee11f2b1f73c37696d1d28aeddd8bb6 SHA1 11b1722f454e39783fae134da125ce7da350758e SHA256 a9b54696c9d73736b798c880e62f626c74b28c85cabdf2c8055c251bf594ef7c
 EBUILD pmacct-0.11.4.ebuild 1580 RMD160 7a17959e51b82a684803c5f1415e580d5af533a5 SHA1 9d66583c33f77aa4b6b16d32132fd4aede0e94f3 SHA256 ad5e7cb6c4b81478d0f526851deab9c4201c86f317bea2660fac94f4b0ba1c1c
+EBUILD pmacct-0.11.5-r1.ebuild 1547 RMD160 7b6eb3fb6c9cfc5822d76dc4403156f4ffea3b28 SHA1 f8bc3da8bb88694181a4e006b4d89bc78ccea6a0 SHA256 65924c27319d93bb3b2fda6e087777c85ca66ae368c27b827709f6951952fc1e
 EBUILD pmacct-0.11.5.ebuild 1583 RMD160 aa70dd03999c10205583732cd0c38c316e249143 SHA1 d26cc6584b280d2df90a6720a88d6f1db479c792 SHA256 2af5bc33049e8d5b045add6b112dab49224f5bf1edba5e5c624697239c060ceb
-MISC ChangeLog 8561 RMD160 2513f5515246ad9257a2bd47b946f266ab8f5e03 SHA1 29ae38ac067b3f4d037a4a578777329799343810 SHA256 62eb833b059456bff9bd4585f03b3bf218f528bec0ce2618146eb5a37c4840b3
+MISC ChangeLog 8776 RMD160 3ea3ebc73ddc6a8ad9e49f76718ddc0cbf4d8c96 SHA1 a48b62d2d30d46996be2b41a60cd2a4384fc57a9 SHA256 c1b38cfd1bda1f877bd0fc09c7eeee623c358f2f42627e7178fe9625bff77784
 MISC metadata.xml 321 RMD160 db50b95ceeb1cf11fb46bc79f4088b8a1b114eb3 SHA1 6d3bf2118fc41e53f45dfb5d4d6e09ce4f1e1dee SHA256 082a069e7b8707764fd7e8bd5e42efcc20c88b471d4cdf7ac3aec87d7ecb766a
diff --git a/net-analyzer/pmacct/files/pmacctd-init.d.1 b/net-analyzer/pmacct/files/pmacctd-init.d.1
new file mode 100644
index 000000000000..fc75c64a8e9d
--- /dev/null
+++ b/net-analyzer/pmacct/files/pmacctd-init.d.1
@@ -0,0 +1,29 @@
+#!/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.1,v 1.1 2008/11/16 16:00:25 pva Exp $
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ ! -e /etc/pmacctd.conf ] ; then
+		eerror "You need an /etc/pmacctd.conf file to run pmacctd"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting pmacctd"
+	start-stop-daemon --start --pidfile /var/run/pmacctd.pid --exec /usr/sbin/pmacctd \
+		-- -D -f /etc/pmacctd.conf -F /var/run/pmacctd.pid ${OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping pmacctd"
+	start-stop-daemon --stop --pidfile /var/run/pmacctd.pid --exec /usr/sbin/pmacctd
+	eend $?
+}
diff --git a/net-analyzer/pmacct/pmacct-0.11.5-r1.ebuild b/net-analyzer/pmacct/pmacct-0.11.5-r1.ebuild
new file mode 100644
index 000000000000..7687db374583
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-0.11.5-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.11.5-r1.ebuild,v 1.1 2008/11/16 16:00:25 pva Exp $
+
+DESCRIPTION="A network tool to gather ip traffic informations"
+HOMEPAGE="http://www.pmacct.net/"
+SRC_URI="http://www.pmacct.net/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="64bit debug ipv6 mmap mysql postgres sqlite3"
+
+RDEPEND="net-libs/libpcap
+	mysql? ( virtual/mysql )
+	postgres? ( virtual/postgresql-base )
+	sqlite3? ( =dev-db/sqlite-3* )"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i "s|\(CFLAGS=\).*$|\1\"${CFLAGS}\"|g" configure || die "sed failed"
+}
+
+src_compile() {
+	econf \
+		$(use_enable mysql) \
+		$(use_enable postgres pgsql) \
+		$(use_enable mmap) \
+		$(use_enable ipv6) \
+		$(use_enable debug) \
+		$(use_enable 64bit) \
+		$(use_enable sqlite3)
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc README EXAMPLES KNOWN-BUGS CONFIG-KEYS FAQS ChangeLog docs/SIGNALS \
+		docs/PLUGINS docs/INTERNALS TODO TOOLS || die "dodoc failed"
+
+	for dirname in examples sql; do
+		docinto ${dirname}
+		dodoc ${dirname}/* || die "dodoc ${dirname} failed"
+	done
+
+	newinitd "${FILESDIR}"/pmacctd-init.d.1 pmacctd || die "newinitd failed"
+	newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd || die "newconfd failed"
+
+	insinto /etc
+	newins "${S}/examples/pmacctd-imt.conf.example" pmacctd.conf || \
+		die "newins failed"
+}