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

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key A792A613)

5 files changed, 30 insertions, 71 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/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);