Version bump thanks to Marcin Mirosław (bug #339229). Change init.d script to allow multiple instances by Marcin Mirosław (bug #306837).

Package-Manager: portage-2.2_rc86/cvs/Linux i686

7 files changed, 96 insertions, 24 deletions

diff --git a/net-analyzer/pmacct/ChangeLog b/net-analyzer/pmacct/ChangeLog
index 307392472078..147bf3c68527 100644
--- a/net-analyzer/pmacct/ChangeLog
+++ b/net-analyzer/pmacct/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/pmacct
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.68 2010/09/30 16:31:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.69 2010/09/30 16:43:04 jer Exp $
+
+*pmacct-0.12.3 (30 Sep 2010)
+
+  30 Sep 2010; Jeroen Roovers <jer@gentoo.org> pmacct-0.12.0-r1.ebuild,
+  pmacct-0.12.1.ebuild, pmacct-0.12.2.ebuild, +pmacct-0.12.3.ebuild,
+  files/pmacctd-init.d:
+  Version bump thanks to Marcin Mirosław (bug #339229). Change init.d
+  script to allow multiple instances by Marcin Mirosław (bug #306837).
 
 *pmacct-0.12.2 (21 Jul 2010)
 
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index 4c2c9937a74e..ac555f7f4c6d 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,13 +1,16 @@
 AUX pmacct-0.12.0-gentoo.patch 780 RMD160 8711c74fa0bdf3c7c2c9cf45094453a659947dd0 SHA1 6889640809c1b0d66c1cccceb29ed4f82db72ae5 SHA256 a0f2205b7106cf813cfdb0106e2e3db5e28bfb35506b0dbac13cceb26c74054a
 AUX pmacctd-conf.d 266 RMD160 00d82dca28a19b81653208976df68f69b5609a80 SHA1 7f1dc7f56dc3c5cd143c8120d8f919a5616605a7 SHA256 341dee2b5e870747a39b8639efec2d8e37133251be0f6a5243629b6440991f34
-AUX pmacctd-init.d 744 RMD160 7c8fb28b0c7cc86c293991e8ec1829e445308bcf SHA1 ce129b23c4c29142bfc699bac8215928e930d096 SHA256 a22eeebab95ea1fea2c518a0d8835894487bf6b80c20d4613688bc8e3958dec8
+AUX pmacctd-conf.d.orig 266 RMD160 00d82dca28a19b81653208976df68f69b5609a80 SHA1 7f1dc7f56dc3c5cd143c8120d8f919a5616605a7 SHA256 341dee2b5e870747a39b8639efec2d8e37133251be0f6a5243629b6440991f34
+AUX pmacctd-init.d 929 RMD160 3b0c036f7d121e7afb8f88468486ccbd425f6e15 SHA1 295317b32e520f30c10682d5f9a4d5113d300e58 SHA256 0f7d2ea1cac4c392dd1ac1bcc8dd1cdcf724283ef1be3fa4c0e0e3f1ea96e26d
 DIST pmacct-0.11.5.tar.gz 423251 RMD160 4f54c8102bc1a759beddf749667839d420783767 SHA1 f4ca3086153094a1335d059b0aee9015f0079bf9 SHA256 d26b98e8a8cb670222983df46746d860e27beca032b5feff6439c3f3c0aad752
 DIST pmacct-0.12.0.tar.gz 523032 RMD160 f2ea296ec21929094235f6877ec1be32f15cba5d SHA1 6502ac135d84ed30173c9a0acbdc8772505f9246 SHA256 4a3543597ca107cadf50a7fc4bfe0d3ed9ab4fdd17de01bce98132289a427cd0
 DIST pmacct-0.12.1.tar.gz 530342 RMD160 31f2ee5d15e0835a64c06f9b24e2acc137e3d862 SHA1 3266bc4493e61558293b7a36441e2e8b385b25e8 SHA256 e562a416b2483e4611764e9633e8b8b50b5ce008322f27994e6af6479a39f65a
 DIST pmacct-0.12.2.tar.gz 536431 RMD160 0a0961a586d55259fc3b52c7718d41bc907e5859 SHA1 49c962593c3cbb98fedc8e33c0f6afecc594254f SHA256 5b4555ae2bc70eff9ad6ffc0a656108edd007bd826fa6df9bd16b98314ca760d
+DIST pmacct-0.12.3.tar.gz 542529 RMD160 c52e2abf4fd825ac125e8fdcac75ecb668836840 SHA1 670faafb512ec783bf321268c836e894e6ae631f SHA256 14cb0ef973a0f1b5c0257cdb5942448a992741f59cc8b180154c5bd24fda5bde
 EBUILD pmacct-0.11.5-r1.ebuild 1550 RMD160 d39c0c436d3aeb5cc4961b0f07986d46faa13e7a SHA1 0cf7f951bcf9796294c9839b7231d3225cd10fd6 SHA256 12c2579288634a41f86f1baccf90a9d1d52efde35ee63ccd3245f08076c6c6fd
-EBUILD pmacct-0.12.0-r1.ebuild 1649 RMD160 72718a2084f35b1be424a306bd400cfe3eca4882 SHA1 50b0cedc2a67a1b5a5cab7a2e1cef1dd59629d66 SHA256 40cba5d5ca162652a19b8f6778bcf102894401c99a46ef89e5878ff0b6e974d4
-EBUILD pmacct-0.12.1.ebuild 1654 RMD160 785cb39ff6bcf3b72bf166cc4c4f3b2df0deb631 SHA1 f4379c00dfdeb0c9d3e9d5e3f41cb1254ee425fe SHA256 27b8a5cfb5fafffb67d0518267a6c0ac6671c59792809e17fcf23d067d5fefc4
-EBUILD pmacct-0.12.2.ebuild 1649 RMD160 53943b5cadb973f943b0e0627f0fc37f0c26dff0 SHA1 0bc94dfbb4410655f36d98dedbab433ac267feb5 SHA256 cc37e14c3dca5a2b1f07ae1fe3c41b9eb19809cb85ce6979b364fca7c009d56a
-MISC ChangeLog 10770 RMD160 fb49fd83de48d531b0f3fc355ad1d11ca6899248 SHA1 71f292b49c71c62b05e15da45d394ef1f2b8cbc0 SHA256 b1df15f46968d67271bb813e846801bf21bb72d03bb737cdfd8aa0fda2ef039e
+EBUILD pmacct-0.12.0-r1.ebuild 1592 RMD160 04d6097bd58a96a5b893517901d98fa8dfdc8264 SHA1 0af99e52962bc4b43393b4ccee61de7b030a79a2 SHA256 b6fbc34efb89e94c4e560a5aa5ea43875266371eeceabbf2af0393700e9770c7
+EBUILD pmacct-0.12.1.ebuild 1597 RMD160 222ddbd2f25e82028658fa0d05f4f2f5ed9b1116 SHA1 3bafc01d8dc2eb6a19ad5911618eb4a315c74500 SHA256 8aeb30a92204180bae5bd179fbbbb69d31a964fef80fdeca3ca824e7add75ed2
+EBUILD pmacct-0.12.2.ebuild 1596 RMD160 f591f11324954268ff6aec312a2e20dadda7f155 SHA1 98b61ec4e1e3b98cb0dece954cbe95c7d4f15f3a SHA256 9d82b3b07576acd7c2718735f4f213f503ecb5095c7d5ac8c9df114df28a3a26
+EBUILD pmacct-0.12.3.ebuild 1596 RMD160 4633bcb797646c3119da59e6edfb887e74dac943 SHA1 b30b30206117847cc22e91e1328a2d09a49e2809 SHA256 27a575420a68c3ff45b265d338fcf5bd66b6293f5ed787e1f8de30325fba984a
+MISC ChangeLog 11109 RMD160 a60e9b313c40565f6eef5b7358a4e71bb1d9bd7d SHA1 58943921e003a9afb7c4016615e9e90d3939609f SHA256 e2eaab1bfc4852ec2eee2c2f57e99c3019e631be75af77f27ea4a6b168baaed1
 MISC metadata.xml 371 RMD160 e4cc8890693c53d4a20615455dc35173906be14b SHA1 afc98635ba56ebd01607028feb938a805d77139d SHA256 2cc1ad160ce6d50f18af1a3cad6fbaa13ad54455c8d5641667fb7f08c4e9e2ae
diff --git a/net-analyzer/pmacct/files/pmacctd-init.d b/net-analyzer/pmacct/files/pmacctd-init.d
index 987e9c603a2a..1db2f92c05cd 100644
--- a/net-analyzer/pmacct/files/pmacctd-init.d
+++ b/net-analyzer/pmacct/files/pmacctd-init.d
@@ -1,29 +1,37 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2010 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.4 2009/06/01 09:48:41 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/files/pmacctd-init.d,v 1.5 2010/09/30 16:43:05 jer Exp $
+
+PMACCTDDIR=${PMACCTDDIR:-/etc/pmacct}
+if [ ${SVCNAME} != "pmacctd" ]; then
+	PMACCTDPID="/var/run/${SVCNAME}.pid"
+else
+	PMACCTDPID="/var/run/pmacctd.pid"
+fi
+PMACCTDCONF="${PMACCTDDIR}/${SVCNAME}.conf"
 
 depend() {
 	need net
 }
 
 checkconfig() {
-	if [ ! -e /etc/pmacctd.conf ] ; then
-		eerror "You need an /etc/pmacctd.conf file to run pmacctd"
+	if [ ! -e ${PMACCTDCONF} ] ; then
+		eerror "You need an ${PMACCTDCONF} 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}
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --pidfile "${PMACCTDPID}" --exec /usr/sbin/pmacctd \
+		-- -D -f "${PMACCTDCONF}" -F "${PMACCTDPID}" ${OPTS}
 	eend $?
 }
 
 stop() {
-	ebegin "Stopping pmacctd"
-	start-stop-daemon --stop --pidfile /var/run/pmacctd.pid --exec /usr/sbin/pmacctd
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --pidfile "${PMACCTDPID}" --exec /usr/sbin/pmacctd
 	eend $?
 }
diff --git a/net-analyzer/pmacct/pmacct-0.12.0-r1.ebuild b/net-analyzer/pmacct/pmacct-0.12.0-r1.ebuild
index 8f9742d4ef58..e765ea5473a8 100644
--- a/net-analyzer/pmacct/pmacct-0.12.0-r1.ebuild
+++ b/net-analyzer/pmacct/pmacct-0.12.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.12.0-r1.ebuild,v 1.2 2010/06/17 20:32:12 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.12.0-r1.ebuild,v 1.3 2010/09/30 16:43:04 jer Exp $
 
 EAPI="2"
 
@@ -22,8 +22,6 @@ RDEPEND="net-libs/libpcap
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	cp -av configure{,.org}
-	cp -av configure.in{,.org}
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 }
 
diff --git a/net-analyzer/pmacct/pmacct-0.12.1.ebuild b/net-analyzer/pmacct/pmacct-0.12.1.ebuild
index e3dbbdc8fdc9..f3dfcf71ae8b 100644
--- a/net-analyzer/pmacct/pmacct-0.12.1.ebuild
+++ b/net-analyzer/pmacct/pmacct-0.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.12.1.ebuild,v 1.2 2010/06/17 20:32:12 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.12.1.ebuild,v 1.3 2010/09/30 16:43:04 jer Exp $
 
 EAPI="2"
 
@@ -22,8 +22,6 @@ RDEPEND="net-libs/libpcap
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	cp -av configure{,.org}
-	cp -av configure.in{,.org}
 	epatch "${FILESDIR}"/${PN}-0.12.0-gentoo.patch
 }
 
diff --git a/net-analyzer/pmacct/pmacct-0.12.2.ebuild b/net-analyzer/pmacct/pmacct-0.12.2.ebuild
index e10bc5259d87..724a1cce9672 100644
--- a/net-analyzer/pmacct/pmacct-0.12.2.ebuild
+++ b/net-analyzer/pmacct/pmacct-0.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.12.2.ebuild,v 1.1 2010/07/21 16:21:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.12.2.ebuild,v 1.2 2010/09/30 16:43:04 jer Exp $
 
 EAPI="2"
 
@@ -22,8 +22,6 @@ RDEPEND="net-libs/libpcap
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	cp -av configure{,.org}
-	cp -av configure.in{,.org}
 	epatch "${FILESDIR}"/${PN}-0.12.0-gentoo.patch
 }
 
diff --git a/net-analyzer/pmacct/pmacct-0.12.3.ebuild b/net-analyzer/pmacct/pmacct-0.12.3.ebuild
new file mode 100644
index 000000000000..7a4dcf44d709
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-0.12.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.12.3.ebuild,v 1.1 2010/09/30 16:43:04 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A network tool to gather IP traffic information"
+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 mysql postgres sqlite threads ulog"
+
+RDEPEND="net-libs/libpcap
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )
+	sqlite? ( =dev-db/sqlite-3* )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.12.0-gentoo.patch
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		$(use_enable 64bit) \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_enable mysql) \
+		$(use_enable postgres pgsql) \
+		$(use_enable sqlite sqlite3) \
+		$(use_enable threads) \
+		$(use_enable ulog) \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc ChangeLog CONFIG-KEYS EXAMPLES FAQS KNOWN-BUGS README UPGRADE \
+		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 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"
+}