Fix overflow (bug #342309).

Package-Manager: portage-2.2.0_alpha49/cvs/Linux x86_64

4 files changed, 40 insertions, 10 deletions

diff --git a/net-analyzer/bigeye/ChangeLog b/net-analyzer/bigeye/ChangeLog
index f34a23d7ab76..f8a44c905b6f 100644
--- a/net-analyzer/bigeye/ChangeLog
+++ b/net-analyzer/bigeye/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/bigeye
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bigeye/ChangeLog,v 1.15 2010/08/28 04:26:56 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bigeye/ChangeLog,v 1.16 2011/08/01 01:41:43 jer Exp $
+
+*bigeye-0.3-r3 (01 Aug 2011)
+
+  01 Aug 2011; Jeroen Roovers <jer@gentoo.org> -bigeye-0.3-r2.ebuild,
+  +bigeye-0.3-r3.ebuild, +files/bigeye-0.3-overflow.patch:
+  Fix overflow (bug #342309).
 
 *bigeye-0.3-r2 (28 Aug 2010)
 
diff --git a/net-analyzer/bigeye/Manifest b/net-analyzer/bigeye/Manifest
index 64866379ae3c..39409f0a72d5 100644
--- a/net-analyzer/bigeye/Manifest
+++ b/net-analyzer/bigeye/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX bigeye-0.3-overflow.patch 436 RMD160 c07272a5405c54b035886fb6f3ca4a0aa4b2634f SHA1 097b0669762bd06352962d769b6e57ec04573ff2 SHA256 4f9e52e9ca9565259b02847a4e7231b960c456880705b697d275775b04b9b822
 DIST bigeye-0.3-gcc34.diff.bz2 2774 RMD160 363255a524081efc9fe761eeb0d256cd36a5690f SHA1 2c78cb7ba73c74f08c3b02251cf48e09b4c17b63 SHA256 06e50f31e6e162502dc9e24db416301ad7bbd5439b7611faa405020085668738
 DIST bigeye-0.3.tgz 32462 RMD160 bdb7569a1491321f5ae82096db8084a7f6c06b5c SHA1 0caf69991ef645c1aa33f45e6ee142a8b7b6950e SHA256 e03aacd1797dece3b8a1521f7df44dd63f8417e988ce0be218079ae49cd7490d
 EBUILD bigeye-0.3-r1.ebuild 1004 RMD160 b0514bcc4f1cf27608e06f86eadf9d7178de3ec2 SHA1 84a508a2897519f0b883b4a4e7c1843f7311426d SHA256 0a7ae12dd7a390aa92605064500ea40ecad334ae4a7afbdecf19ee79d6f61efd
-EBUILD bigeye-0.3-r2.ebuild 942 RMD160 69b94e727ee91f8a26430e47405faba67942736a SHA1 7cd0355053852de2ff25fac7a71a7aca8b7d43cf SHA256 e7497c01f467aff6c73a40f22d9f7d9e6e1a705b340b2e153b0ca994601326bd
-MISC ChangeLog 1845 RMD160 0ccda4d6273d631561d2714cb0e9390339c2f86e SHA1 b8a70297da2b66ffdd159fc56dcca300b015aa22 SHA256 a3d18546e13d3531395f946bbec701a541e2a5098a13d5e7c077fdc9577d0f26
+EBUILD bigeye-0.3-r3.ebuild 984 RMD160 1a545e4fb59c3b67bf648c00159c1bf1c2c192da SHA1 f6b062c97429681ed367feccc4bc12cdc23ec15a SHA256 4ff634cc8dcb7ef6cf4e2506f90523110a513ab274dec4138fc42558e81bef63
+MISC ChangeLog 2035 RMD160 56d21693f786a8257d15193c0a184b9a611f70ce SHA1 08f4dccf101cc01c0838cacc42189578f2701950 SHA256 b358b46af0a4033910189bb024d1dde184b1671e6f9b55c7bf67f89f769663fb
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk42BF0ACgkQVWmRsqeSphPHXACeKDMIY5LcYUKvX9gyZSAa+h/o
+r7YAn0dcgMaCdMhEzOXylnevp6JqV+5u
+=je3l
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/bigeye/bigeye-0.3-r2.ebuild b/net-analyzer/bigeye/bigeye-0.3-r3.ebuild
index c25ea4cb1dfb..e99493ad13a2 100644
--- a/net-analyzer/bigeye/bigeye-0.3-r2.ebuild
+++ b/net-analyzer/bigeye/bigeye-0.3-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bigeye/bigeye-0.3-r2.ebuild,v 1.1 2010/08/28 04:26:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bigeye/bigeye-0.3-r3.ebuild,v 1.1 2011/08/01 01:41:43 jer Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit eutils toolchain-funcs
 
@@ -19,19 +19,21 @@ IUSE=""
 DEPEND=""
 
 src_prepare() {
-	epatch "${WORKDIR}"/${P}-gcc34.diff
+	epatch \
+		"${WORKDIR}"/${P}-gcc34.diff \
+		"${FILESDIR}"/${P}-overflow.patch
 	sed -i README \
 		-e "s|-- /messages/|-- /usr/share/bigeye/messages/|g" \
 		|| die "sed README"
 }
 
 src_compile() {
-	cd src
+	cd src || die
 	$(tc-getCC) ${CFLAGS} ${LDFLAGS} bigeye.c emulate.c -o bigeye || die
 }
 
 src_install() {
-	dobin src/bigeye || die
+	dobin src/bigeye
 
 	insinto /usr/share/bigeye
 	doins sig.file
diff --git a/net-analyzer/bigeye/files/bigeye-0.3-overflow.patch b/net-analyzer/bigeye/files/bigeye-0.3-overflow.patch
new file mode 100644
index 000000000000..bb0086ea0454
--- /dev/null
+++ b/net-analyzer/bigeye/files/bigeye-0.3-overflow.patch
@@ -0,0 +1,11 @@
+--- src/bigeye.c.org	2011-08-01 03:11:16.779811941 +0200
++++ src/bigeye.c	2011-08-01 03:13:34.830778894 +0200
+@@ -787,7 +787,7 @@
+ 	local.sin_family = 	AF_INET;
+ 	local.sin_port   =	htons(porta);
+ 	local.sin_addr.s_addr =	INADDR_ANY;
+-	bzero(&(local.sin_zero),sizeof(local));
++	memset(&(local.sin_zero), "\0", sizeof(local.sin_zero));
+ 
+ 	if(setsockopt(sock_a, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0) {
+ 		perror("setsockopt");