Adjust string size to avoid buffer overflow. Bug #339456

(Portage version: 2.2_rc86/cvs/Linux x86_64)

3 files changed, 61 insertions, 1 deletions

diff --git a/net-analyzer/netwatch/ChangeLog b/net-analyzer/netwatch/ChangeLog
index e6f1766a673c..3f827c81e16f 100644
--- a/net-analyzer/netwatch/ChangeLog
+++ b/net-analyzer/netwatch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/netwatch
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netwatch/ChangeLog,v 1.13 2010/06/28 19:46:54 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netwatch/ChangeLog,v 1.14 2010/10/05 18:01:58 hwoarang Exp $
+
+*netwatch-1.3.0.1-r1 (05 Oct 2010)
+
+  05 Oct 2010; Markos Chandras <hwoarang@gentoo.org>
+  +netwatch-1.3.0.1-r1.ebuild, +files/netwatch-1.3.0.1-fix-fortify.patch:
+  Adjust string size to avoid buffer overflow. Bug #339456
 
   28 Jun 2010; Christian Faulhammer <fauli@gentoo.org>
   netwatch-1.3.0.1.ebuild:
diff --git a/net-analyzer/netwatch/files/netwatch-1.3.0.1-fix-fortify.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-fix-fortify.patch
new file mode 100644
index 000000000000..d9b95a980aa9
--- /dev/null
+++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-fix-fortify.patch
@@ -0,0 +1,13 @@
+Index: netwatch-1.3.0/netwatch.c
+===================================================================
+--- netwatch-1.3.0.orig/netwatch.c
++++ netwatch-1.3.0/netwatch.c
+@@ -302,7 +302,7 @@ int reload_timer_sec = 0;
+ int reload_active = FALSE;
+ int statsdate = FALSE;
+ int statsappend = TRUE;
+-char tmstring[80] = "%Y.%m.%d.%H.%M";
++char tmstring[256] = "%Y.%m.%d.%H.%M";
+ int freezedisplay = FALSE;
+ int lastfreeze = FALSE;
+ int sentclear = FALSE;
diff --git a/net-analyzer/netwatch/netwatch-1.3.0.1-r1.ebuild b/net-analyzer/netwatch/netwatch-1.3.0.1-r1.ebuild
new file mode 100644
index 000000000000..2b14f6a2ecea
--- /dev/null
+++ b/net-analyzer/netwatch/netwatch-1.3.0.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netwatch/netwatch-1.3.0.1-r1.ebuild,v 1.1 2010/10/05 18:01:58 hwoarang Exp $
+
+EAPI="2"
+
+inherit versionator eutils
+
+MY_PV=$(replace_version_separator 3 '-')
+
+DESCRIPTION="Ethernet/PPP IP Packet Monitor"
+HOMEPAGE="http://www.slctech.org/~mackay/netwatch.html"
+SRC_URI="http://www.slctech.org/~mackay/NETWATCH/${PN}-${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers"
+
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
+
+src_prepare() {
+	epatch "${FILESDIR}"/append_ldflags.patch
+	epatch "${FILESDIR}/${PN}.c.patch"
+	epatch "${FILESDIR}/${P}-fix-fortify.patch"
+}
+
+src_install() {
+	dosbin netresolv netwatch || die "dosbin failed"
+
+	doman netwatch.1 || die "doman failed"
+	dodoc BUGS CHANGES README* TODO || die "dodoc failed"
+
+	if use doc; then
+		dohtml NetwatchKeyCommands.html || die "dohtml failed"
+	fi
+}