Fix buffer overflow (bug #449868). Set correct license.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

6 files changed, 37 insertions, 79 deletions

diff --git a/net-analyzer/argus-clients/ChangeLog b/net-analyzer/argus-clients/ChangeLog
index 8d796de091e7..509d68170490 100644
--- a/net-analyzer/argus-clients/ChangeLog
+++ b/net-analyzer/argus-clients/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/argus-clients
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/ChangeLog,v 1.51 2012/12/10 13:07:17 jer Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/ChangeLog,v 1.52 2013/01/03 00:48:01 jer Exp $
+
+*argus-clients-3.0.7.4-r1 (03 Jan 2013)
+
+  03 Jan 2013; Jeroen Roovers <jer@gentoo.org> argus-clients-3.0.6.2.ebuild,
+  -argus-clients-3.0.7.3.ebuild, -argus-clients-3.0.7.4.ebuild,
+  +argus-clients-3.0.7.4-r1.ebuild,
+  +files/argus-clients-3.0.7.4-overflow.patch:
+  Fix buffer overflow (bug #449868). Set correct license.
 
 *argus-clients-3.0.7.4 (10 Dec 2012)
 
diff --git a/net-analyzer/argus-clients/Manifest b/net-analyzer/argus-clients/Manifest
index b8b2a382ae70..1db6e04c770a 100644
--- a/net-analyzer/argus-clients/Manifest
+++ b/net-analyzer/argus-clients/Manifest
@@ -2,18 +2,17 @@
 Hash: SHA256
 
 AUX argus-clients-3.0.4.1-disable-tcp-wrappers-automagic.patch 593 SHA256 660ffa757355cc450f646248bc324fa66038582466eb10985f4521e19bed0509 SHA512 f817bd51125c4c0c8f17b651db2edb1be232440f0a3e3922588e23f5e26c0cff3d0682a0d23654386b5db318d39daa20c6bc94966925d98e62ebae225da74894 WHIRLPOOL e7b8ba0274e356ca808388382b99d90a0fd42d6fe926b6072da0648b7abc4e5bbdfbf380e2026eda4ef7b2af7c69df04e4d573651b8cdd0554ee3c96ca7afd35
+AUX argus-clients-3.0.7.4-overflow.patch 335 SHA256 11603349a0c69a2819b2ac746387f78b4fa5aba5f61132aeb820be8f4210bfca SHA512 1e2437b07d4741a2d0109aee6435423105ac1e0b2d74dfc470def5ec5c97c17f8768b1a8ae9a45e8ac75d791a51f32becce294c25703af6bd1b9a1d039263ded WHIRLPOOL 589bf71d98716bd855a61e65ad10445346c0471d5c78a68c3a7962f7e738e571dd96e0a24f9334d8355669ef18419fd66cefd34284afd0e38bb951ddcaf561fb
 DIST argus-clients-3.0.6.2.tar.gz 2426454 SHA256 f51d7c8d18fa2236f3fe3726deb3c0b8308c0a6ca767c6089811963da95330fc SHA512 bd386fc8561f2c20bac287e4f562cc980935150ea0a987b281d2b952366ccc56ca380723517d5ccd31fd430605e2d6ed9b08f0d8ca88fc3a3bb96ee495f3c36a WHIRLPOOL f1123438afa10f01c14b7aa8bc90766974bae514bf0d41377627f189ba3dab7bca69870eff0f9e8a1e87ac257e97ae2cb9e6eb6ace3022c9697949820a54dab8
-DIST argus-clients-3.0.7.3.tar.gz 2472973 SHA256 9214ce3f29bbbb4e663fbb83003acc222c480985e526a56efd02d70337bf2b28 SHA512 9be9fafe534d15b9fc71c5570115024fe76c2d2ae25333532420074f8aed1ed61456674f0c0a8c49a4979b846b2cb9db4d1b4ae67d4b5a1363e9c5166701e3a7 WHIRLPOOL a008825f164f4b39b46afee775bf8dc07fbf693126e0be4e2df0a2b31d63521bf068acab4ca46119d504145b2b09534a59b724cf362801458e9fe46e247259d2
 DIST argus-clients-3.0.7.4.tar.gz 2503355 SHA256 837b6ac57208f6e6e14cfe62ecc11928de3f202304124e00806221db2d9c322d SHA512 9d3372bb1beb169ca9a7621d47a8237c44a399d2220068d14b14f53829c635435f23fb03d102cf22ebd469c0077847b58c6dcf9a11bad17d1e218a952e4c5447 WHIRLPOOL 808f637cb20900c305cbd03e0d982dcf9876a8a115c844a3848671e2f19d1f609dab826676ab0f85bde44aee61357a6adc62c8c531e217ebabf8e37acffa17a7
-EBUILD argus-clients-3.0.6.2.ebuild 1319 SHA256 2403a447a292bedc6833dd9aee548954c2e42803ef52702fda9d8aa774b3aaff SHA512 3808d42cdaffac57a5c705b66981583396bf434ce9a0dbd361f912ac025ce58a84cf09651dcdcdc275dac5253743846abef6e24199a561f63a3fa45bd85fff70 WHIRLPOOL 5b33a067632360128eb1511578cd48fa70b90512cc8b1b58b76bc2de4d347f1ad5e4e38dcc477d8f099857a31713bda5e231ec87360e8b60883c6133e28d4264
-EBUILD argus-clients-3.0.7.3.ebuild 1315 SHA256 568d471ecc83459466bb2ce3374f16e7e37dcbe397f25823ccb92390815368f9 SHA512 d1e340826798171f607272b6e7c4eadda75c41c9c50f98707eea161b590fc3faea29827a947a910b1b9dc6ab26edf99ab3d42d25ba5090554823b344a5ae414b WHIRLPOOL 6d0986351ea544ae2dd88cfb4ad22f7a45f7d6ccfe38b8082e3c3ae1d4c40ef0a7e058ebd4b0e21f8bbfb08e44f809f26828f6089a5fb4fe810c9308da303169
-EBUILD argus-clients-3.0.7.4.ebuild 1315 SHA256 3d94fd4bacad8a46843b29852e063fbc800b6bb50452e994976247bdfc57b53e SHA512 3ffcab53a7c13ac5a39b18370badd3f419734d054761206d40786c5778170f966364bf0a314a6cb8c9525cb72a9a69cb28c2d10b6aa1b7aa762562dc705702f4 WHIRLPOOL f53d8d0b9d1fa9caf7b90c716040c60c9876892a5ff3261630e788c9f44886c4160e8312dd96d9cf4eca9df2c0459017dc3eaf5b0ebffb02d457cd782fb6e390
-MISC ChangeLog 8399 SHA256 c7853a787c8771ec743d5c478d09b5922c76cb52e6d74e33896e3beffcb423cb SHA512 35d23fd53c552c580983e3fec8db08476fac2a0b82e0121267e905f92a6663e2e54150fc284658bd1a83fbf9ccbd45154910fb27d821cd5ea4cd2bb4e060ed0c WHIRLPOOL 889f27da1fc473bed8a193f5c51233218b8ed24c32991e42001a4ffd3fd652d6f5c9ec5504214bf9765df8bd5e72c9a8b181c9510f3c96226226295a3ac04b45
+EBUILD argus-clients-3.0.6.2.ebuild 1312 SHA256 cfc6aad9351fd77e0e49529797e760cd1560ecb0d382d51816c662fc24e9f07d SHA512 91c1b30451a72cf7bf7cfaf12685ef2f7a40f0d277ac19b51f753e64a13a89fe6526c270267d5d24f089b39344bda635bbd00ef17f5f87dc94988635a87ec225 WHIRLPOOL 32de07db0a60f9612c7305da1102a70168fffc69cc0c8abb058b4df09da07ba248a07ab7509ba1d3697789d4e958351e1644a19610855296c2cf303e74ea2e6d
+EBUILD argus-clients-3.0.7.4-r1.ebuild 1369 SHA256 b0dab0aca393c654c0a70f1610628da4a54e7ddbf90a2f84e3ab9d1e449304aa SHA512 542ed830d3ac4866b1d5d17a50dc4ba27305e4887867c9d21b9ad23b2dbb4c380575cc9e2ad4b105674e46bc0d6195013abd2e5fcc3a9c8d6fc01ad24f9e2c9f WHIRLPOOL a767b42fed5d32758a763626a5f63e7d4de66fcb552dfcb4ae10542bccae621bc88c8e53f49b4ef543efb44291a832dee3767fee0d653d74188075e2c02b3a8c
+MISC ChangeLog 8723 SHA256 763b09c1e7f7d6dc57322f6cb4c93181a2e730a3a2cfb061f76ad9a6f41ba9b4 SHA512 764f3ef98614f3381474ebf9b21bd18a76cb64699c1e8ddcb9c21c20cc36fb6b4ba4e3b956a4695b6b4def651ecd8ca4f4a87ad3b6ca84a79f94d2445ccc3f4c WHIRLPOOL 9715aeb2854fd7388d13bf8af656be2f9b00db4e2af9a8d1f9661e14ffaea2fd441114570490625ddbee7a378f03e536de4050ecb37c80531bba6707f0318c06
 MISC metadata.xml 268 SHA256 a7f0d633cf4ea45d16056b1e9ccdb657e4750e05a1a57bec18c4d42d4d9a3766 SHA512 c6c6fda7bffb51085d1ca255e241cea4fac77c3948a2f120fe1c6b74d06a2c21b17928d1dcfc0df9d3f51de959631fc40645240000114c8c0048a2b122a621e4 WHIRLPOOL f19389783a4c0c045cdd032b48068b07fd007b4668943f68b4cfbedf988490140e41862970bf3ab1f6515a8c8321a1ff6bd5739c98cd4426b921e9582269dab6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDF3ocACgkQVWmRsqeSphM/tQCfQ3axu7CbXDzfsSBTQp3ipAvC
-OUQAniLA1J+em1Lil+sNdsACN56s6ZjG
-=UX17
+iEYEAREIAAYFAlDk1UIACgkQVWmRsqeSphMmAwCfRiKeU+MB8rfdgkVSIZW7xHYF
+vDwAn2m8ekEWAjiL82pgpcMFponSv8ja
+=LsNo
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.6.2.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.6.2.ebuild
index 9ac48f4c13bb..8cf1478ab1e9 100644
--- a/net-analyzer/argus-clients/argus-clients-3.0.6.2.ebuild
+++ b/net-analyzer/argus-clients/argus-clients-3.0.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-3.0.6.2.ebuild,v 1.4 2012/09/23 08:55:42 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-3.0.6.2.ebuild,v 1.5 2013/01/03 00:48:01 jer Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -9,7 +9,7 @@ DESCRIPTION="Clients for net-analyzer/argus"
 HOMEPAGE="http://www.qosient.com/argus/"
 SRC_URI="http://qosient.com/argus/dev/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="debug ft geoip mysql sasl tcpd"
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.7.3.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.7.4-r1.ebuild
index cdf1e439297c..e9c9eb0a1447 100644
--- a/net-analyzer/argus-clients/argus-clients-3.0.7.3.ebuild
+++ b/net-analyzer/argus-clients/argus-clients-3.0.7.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-3.0.7.3.ebuild,v 1.1 2012/10/15 13:07:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-3.0.7.4-r1.ebuild,v 1.1 2013/01/03 00:48:01 jer Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -9,7 +9,7 @@ DESCRIPTION="Clients for net-analyzer/argus"
 HOMEPAGE="http://www.qosient.com/argus/"
 SRC_URI="http://qosient.com/argus/dev/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug ft geoip mysql sasl tcpd"
@@ -36,7 +36,9 @@ DEPEND="
 "
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch
+	epatch \
+		"${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch \
+		"${FILESDIR}"/${PN}-3.0.7.4-overflow.patch
 	eautoreconf
 }
 
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.7.4.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.7.4.ebuild
deleted file mode 100644
index 5301f6beab03..000000000000
--- a/net-analyzer/argus-clients/argus-clients-3.0.7.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-3.0.7.4.ebuild,v 1.1 2012/12/10 13:07:17 jer Exp $
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="Clients for net-analyzer/argus"
-HOMEPAGE="http://www.qosient.com/argus/"
-SRC_URI="http://qosient.com/argus/dev/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug ft geoip mysql sasl tcpd"
-
-MY_CDEPEND="
-	net-analyzer/rrdtool[perl]
-	net-libs/libpcap
-	sys-libs/ncurses
-	sys-libs/readline
-	ft? ( net-analyzer/flow-tools )
-	geoip? ( dev-libs/geoip )
-	mysql? ( virtual/mysql )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-
-RDEPEND="
-	${MY_CDEPEND}
-"
-
-DEPEND="
-	${MY_CDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch
-	eautoreconf
-}
-
-src_configure() {
-	use debug && touch .debug
-	econf \
-		$(use_with ft libft) \
-		$(use_with geoip GeoIP /usr/) \
-		$(use_with sasl) \
-		$(use_with tcpd wrappers) \
-		$(use_with mysql)
-}
-
-src_compile() {
-	emake CCOPT="${CFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	# argus_parse.a and argus_common.a are supplied by net-analyzer/argus
-	dobin bin/ra*
-	dodoc ChangeLog CREDITS README CHANGES
-	doman man/man{1,5}/*
-}
diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.7.4-overflow.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.7.4-overflow.patch
new file mode 100644
index 000000000000..28d9fb1af6db
--- /dev/null
+++ b/net-analyzer/argus-clients/files/argus-clients-3.0.7.4-overflow.patch
@@ -0,0 +1,11 @@
+--- a/common/argus_util.c
++++ b/common/argus_util.c
+@@ -7473,7 +7473,7 @@
+             default: format = "%d"; break;
+          }
+       }
+-      snprintf (upstr, 128, format, port);
++      snprintf (upstr, sizeof(upstr), format, port);
+ 
+       if (parser->ArgusPrintXml) {
+          sprintf (buf, " %sPort = \"%s\"", dirstr, upstr);