Version bump. Set sizeof(sin6_addr) instead of hardcoded value (bug #340147).

Package-Manager: portage-2.2.0_alpha10/cvs/Linux i686

4 files changed, 92 insertions, 2 deletions

diff --git a/net-analyzer/pmacct/ChangeLog b/net-analyzer/pmacct/ChangeLog
index fa11eb21f735..2fe5b95db45a 100644
--- a/net-analyzer/pmacct/ChangeLog
+++ b/net-analyzer/pmacct/ChangeLog
@@ -1,6 +1,12 @@
 # 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.72 2010/10/16 14:01:10 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.73 2010/12/29 16:57:29 jer Exp $
+
+*pmacct-0.12.5 (29 Dec 2010)
+
+  29 Dec 2010; Jeroen Roovers <jer@gentoo.org> +pmacct-0.12.5.ebuild,
+  +files/pmacct-0.12.5-sin6_addr.patch:
+  Version bump. Set sizeof(sin6_addr) instead of hardcoded value (bug #340147).
 
   16 Oct 2010; Brent Baude <ranger@gentoo.org> pmacct-0.12.2.ebuild:
   stable ppc, bug 339280
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index c1e326def1f6..127a93ba363c 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,9 +1,12 @@
 AUX pmacct-0.12.0-gentoo.patch 780 RMD160 8711c74fa0bdf3c7c2c9cf45094453a659947dd0 SHA1 6889640809c1b0d66c1cccceb29ed4f82db72ae5 SHA256 a0f2205b7106cf813cfdb0106e2e3db5e28bfb35506b0dbac13cceb26c74054a
+AUX pmacct-0.12.5-sin6_addr.patch 1053 RMD160 6f1e12a1228fca2168438ab16c1c4f4a97ffb42d SHA1 541c91d6c981e59fdb1fe626761586c0d67ea792 SHA256 0c71d58ad9754098259b614e38663a1b660a69ebaf5507551b61d208754b1092
 AUX pmacctd-conf.d 266 RMD160 00d82dca28a19b81653208976df68f69b5609a80 SHA1 7f1dc7f56dc3c5cd143c8120d8f919a5616605a7 SHA256 341dee2b5e870747a39b8639efec2d8e37133251be0f6a5243629b6440991f34
 AUX pmacctd-init.d 929 RMD160 3b0c036f7d121e7afb8f88468486ccbd425f6e15 SHA1 295317b32e520f30c10682d5f9a4d5113d300e58 SHA256 0f7d2ea1cac4c392dd1ac1bcc8dd1cdcf724283ef1be3fa4c0e0e3f1ea96e26d
 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
+DIST pmacct-0.12.5.tar.gz 552007 RMD160 de505ff82158fa56ebdc2a7f485814a0680b3d0c SHA1 efbabc0ae624f1b5c1229c0ded26b9bd5debc5cd SHA256 5252d7df24e9baefcc5a36ed66e9cac5ae505c9d502c8cffb96e6808acbb2fe8
 EBUILD pmacct-0.12.2.ebuild 1596 RMD160 0c0acdf6de43ec8c63120b4b8ca90d3fe7036183 SHA1 7687d838083106266a86e95068e81595c58f00ea SHA256 0f6bd528a084115ab60fe7c4b92b8efcf65143423e6205643a2e65903bda658a
 EBUILD pmacct-0.12.3.ebuild 1596 RMD160 4633bcb797646c3119da59e6edfb887e74dac943 SHA1 b30b30206117847cc22e91e1328a2d09a49e2809 SHA256 27a575420a68c3ff45b265d338fcf5bd66b6293f5ed787e1f8de30325fba984a
-MISC ChangeLog 11414 RMD160 4250d3dfa7fbae50110dbbbfc107af12b72d3e58 SHA1 9456a68ff61c6ed68131d248f23f0bbffbdd32dd SHA256 2c1bd4e9a087420bca8a50284f996391bbe018c8e128cdb1dd1b3bc58320d93f
+EBUILD pmacct-0.12.5.ebuild 1647 RMD160 e6496644cadea4fea2350b4daa35195538643edf SHA1 768d5f1efbd1164cff52bcbd8a5fd9315c026e20 SHA256 a8f92bbe425a2f480a3065b6801aa1112e77bb778031d32a7d478189ad3c89c5
+MISC ChangeLog 11632 RMD160 8e27b1313b473406cc6193ccc6b9f69fd1306a28 SHA1 2607f7977638ca64cd69de6ceb065e12c7b68ee5 SHA256 99e848960884eb1fb2f483a1bc905cdc39ba2ce992d57ee5c718d4d539ddb02b
 MISC metadata.xml 371 RMD160 e4cc8890693c53d4a20615455dc35173906be14b SHA1 afc98635ba56ebd01607028feb938a805d77139d SHA256 2cc1ad160ce6d50f18af1a3cad6fbaa13ad54455c8d5641667fb7f08c4e9e2ae
diff --git a/net-analyzer/pmacct/files/pmacct-0.12.5-sin6_addr.patch b/net-analyzer/pmacct/files/pmacct-0.12.5-sin6_addr.patch
new file mode 100644
index 000000000000..4c81beae4236
--- /dev/null
+++ b/net-analyzer/pmacct/files/pmacct-0.12.5-sin6_addr.patch
@@ -0,0 +1,20 @@
+--- a/src/bgp/bgp.c	2010-12-21 17:56:52.000000000 +0100
++++ b/src/bgp/bgp.c	2010-12-29 17:44:43.000000000 +0100
+@@ -1782,7 +1782,7 @@
+               sa = &sa_local;
+               memset(sa, 0, sizeof(struct sockaddr));
+               sa->sa_family = AF_INET6;
+-              memcpy(&((struct sockaddr_in6 *)sa)->sin6_addr, &info->attr->mp_nexthop.address.ipv6, 16);
++              memcpy(&((struct sockaddr_in6 *)sa)->sin6_addr, &info->attr->mp_nexthop.address.ipv6, sizeof(&((struct sockaddr_in6 *)sa)->sin6_addr));
+               goto start_again;
+             }
+ #endif
+@@ -1911,7 +1911,7 @@
+           pptrs->f_agent = (char *) &sa_local;
+           memset(sa, 0, sizeof(struct sockaddr));
+           sa->sa_family = AF_INET6;
+-          memcpy(&((struct sockaddr_in6 *)sa)->sin6_addr, &info->attr->mp_nexthop.address.ipv6, 16);
++          memcpy(&((struct sockaddr_in6 *)sa)->sin6_addr, &info->attr->mp_nexthop.address.ipv6, sizeof(&((struct sockaddr_in6 *)sa)->sin6_addr));
+ 	  saved_info = (char *) info;
+ 	  ttl--;
+           goto start_again;
diff --git a/net-analyzer/pmacct/pmacct-0.12.5.ebuild b/net-analyzer/pmacct/pmacct-0.12.5.ebuild
new file mode 100644
index 000000000000..51ce5704519c
--- /dev/null
+++ b/net-analyzer/pmacct/pmacct-0.12.5.ebuild
@@ -0,0 +1,61 @@
+# 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.5.ebuild,v 1.1 2010/12/29 16:57:29 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 \
+		"${FILESDIR}"/${PN}-0.12.5-sin6_addr.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"
+}