Fix buffer overflow (bug #337415).

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

4 files changed, 69 insertions, 10 deletions

diff --git a/net-analyzer/fwlogwatch/ChangeLog b/net-analyzer/fwlogwatch/ChangeLog
index bfe4e27c29e1..527cb393d30f 100644
--- a/net-analyzer/fwlogwatch/ChangeLog
+++ b/net-analyzer/fwlogwatch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/fwlogwatch
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fwlogwatch/ChangeLog,v 1.21 2010/11/30 21:02:52 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fwlogwatch/ChangeLog,v 1.22 2011/08/01 02:31:27 jer Exp $
+
+*fwlogwatch-1.2-r1 (01 Aug 2011)
+
+  01 Aug 2011; Jeroen Roovers <jer@gentoo.org> -fwlogwatch-1.2.ebuild,
+  +fwlogwatch-1.2-r1.ebuild, +files/fwlogwatch-1.2-overflow.patch:
+  Fix buffer overflow (bug #337415).
 
 *fwlogwatch-1.2 (30 Nov 2010)
 
diff --git a/net-analyzer/fwlogwatch/Manifest b/net-analyzer/fwlogwatch/Manifest
index 0dbcd36103f4..26a78ddbcae5 100644
--- a/net-analyzer/fwlogwatch/Manifest
+++ b/net-analyzer/fwlogwatch/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fwlogwatch-1.1-make.patch 654 RMD160 d1a0ecbda7bef98ec66e738bf74031054f299e06 SHA1 c1952989b19023ddbb1e9eb343ec5e2eb5fd99f2 SHA256 0cd782c06dbcde19c01c2b1404fabfdaadfe88c4cd5d46e858fd212b570b4b1e
+AUX fwlogwatch-1.2-overflow.patch 1032 RMD160 7398901722a45cd0f609cfad74a34c4a4fb77b7f SHA1 464cc7797d88762172a0bd7855e22b659df79339 SHA256 81a90dc6d14ce8ad18ba6f996b9e98f21b989a8765fe0aa1d5d9074bf79173a3
 DIST fwlogwatch-1.1.tar.bz2 90341 RMD160 e1f4d979cfa71de64918bc2a07869f05288f80d3 SHA1 e5fab39991d894e8617dd63fee5d683868b1f97c SHA256 9908ef51f79aa069b31851e23550d5bfacb4583fc3569f87ad1a0957c974ba7f
 DIST fwlogwatch-1.2.tar.bz2 88351 RMD160 7e449a4b9027996d9ff77322325cc1909c9e7452 SHA1 537324523bd982f12873efeec08da2cd05e467ff SHA256 f803076f19046c39391e2b1302d01893ad919c8af077f493fda3113061586530
 EBUILD fwlogwatch-1.1-r1.ebuild 1022 RMD160 2947e8fa86a0f831cb1a827085e5618ad3c1da00 SHA1 fdaa5b5c76c4805466ba06fafced37ad6e15629a SHA256 748d61aa0b62a3388c5c56c508d407f02ad65de5841918a2e0c8cf8aa3752fda
 EBUILD fwlogwatch-1.1.ebuild 1181 RMD160 ee4a2d995b43ce4d16ce640d8ddcc865b997af2d SHA1 26c52958da1995e57eea9bead71b22cec2397bbc SHA256 783a0bcc964cc2343d51d990df69a9df7a04e6b1ed7a6a7e4de30ee32b178e9d
-EBUILD fwlogwatch-1.2.ebuild 990 RMD160 8ecd4cbf979636bd6c6cd36ba9e942c86d2ded2f SHA1 cd6b6bbdf6dd103867132a9c8168c79c374d95c1 SHA256 898ec11fff2a69cd625928e7a2f0e5442ca96ff83df35b4d630f382549789c69
-MISC ChangeLog 2809 RMD160 de0c907ffd9c32849917a0483fd1bd208f25aeee SHA1 38b531f3c263467030e515728093abb91db8a12c SHA256 b6175d7c0d2970facb12977f3a3d0d06c3be123acf539f4d7e7836b2880752fb
+EBUILD fwlogwatch-1.2-r1.ebuild 1020 RMD160 3dc168b49118ab5f5d50c07336c9b1e876c9f084 SHA1 40df912d7dda04fabb0116d18ddece620c7c7a48 SHA256 1408c02b4cd649bf3a64bbc125dda3e6482e0aaa77433fe78a4f8bc2c2a150ee
+MISC ChangeLog 3019 RMD160 5695675a7d40f452bf628c3d77e5e0b6505db514 SHA1 9088cad9f9b810a811632426d63f52400d8f3dc3 SHA256 37b6518b339b8b511868aea9107cf9458054de340637d797b6b1401aa46c0d3b
 MISC metadata.xml 236 RMD160 b5272c455699725e16a17ab6528f5351de551976 SHA1 853fad2ea905074246711c2f66af3a458a3f6b9d SHA256 e44031bf6799260ae62d8eba0aeaa1ecde4b80741e13b800daa3a96f37ced031
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk42EAUACgkQVWmRsqeSphOkIgCdENTdtcTv6Xib+Jpg8yxIDKfr
+xEoAnjDXwzpbkUC2HgaDOzdvjAUCoIWj
+=HnR6
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/fwlogwatch/files/fwlogwatch-1.2-overflow.patch b/net-analyzer/fwlogwatch/files/fwlogwatch-1.2-overflow.patch
new file mode 100644
index 000000000000..8691220a3e47
--- /dev/null
+++ b/net-analyzer/fwlogwatch/files/fwlogwatch-1.2-overflow.patch
@@ -0,0 +1,40 @@
+--- a/response.c
++++ b/response.c
+@@ -117,32 +117,32 @@
+   }
+ 
+   snprintf(buf2, BUFSIZE, " %d %s", this_host->count, inet_ntoa(this_host->shost));
+-  strncat(buf, buf2, BUFSIZE);
++  strncat(buf, buf2, BUFSIZE -1);
+ 
+   if (opt.dst_ip) {
+     snprintf(buf2, BUFSIZE, " %s", inet_ntoa(this_host->dhost));
+-    strncat(buf, buf2, BUFSIZE);
++    strncat(buf, buf2, BUFSIZE -1);
+   } else {
+     strncat(buf, " -", BUFSIZE);
+   }
+ 
+   if (opt.proto) {
+     snprintf(buf2, BUFSIZE, " %d", this_host->protocol);
+-    strncat(buf, buf2, BUFSIZE);
++    strncat(buf, buf2, BUFSIZE -1);
+   } else {
+     strncat(buf, " -", BUFSIZE);
+   }
+ 
+   if (opt.src_port) {
+     snprintf(buf2, BUFSIZE, " %d", this_host->sport);
+-    strncat(buf, buf2, BUFSIZE);
++    strncat(buf, buf2, BUFSIZE -1);
+   } else {
+     strncat(buf, " -", BUFSIZE);
+   }
+ 
+   if (opt.dst_port) {
+     snprintf(buf2, BUFSIZE, " %d", this_host->dport);
+-    strncat(buf, buf2, BUFSIZE);
++    strncat(buf, buf2, BUFSIZE -1);
+   } else {
+     strncat(buf, " -", BUFSIZE);
+   }
diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.2.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.2-r1.ebuild
index 43fddb4e06c5..b3c48086c156 100644
--- a/net-analyzer/fwlogwatch/fwlogwatch-1.2.ebuild
+++ b/net-analyzer/fwlogwatch/fwlogwatch-1.2-r1.ebuild
@@ -1,10 +1,10 @@
-# 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/fwlogwatch/fwlogwatch-1.2.ebuild,v 1.1 2010/11/30 21:02:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fwlogwatch/fwlogwatch-1.2-r1.ebuild,v 1.1 2011/08/01 02:31:27 jer Exp $
 
-EAPI="2"
+EAPI="4"
 
-inherit toolchain-funcs eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="A packet filter and firewall log analyzer"
 HOMEPAGE="http://fwlogwatch.inside-security.de/"
@@ -16,12 +16,14 @@ SLOT="0"
 IUSE=""
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.1-make.patch"
+	epatch \
+		"${FILESDIR}"/${PN}-1.1-make.patch \
+		"${FILESDIR}"/${PN}-1.2-overflow.patch
 }
 
 src_compile() {
 	tc-export CC
-	emake || die "emake failed"
+	default
 }
 
 src_install() {