Adjust string size to avoid buffer overflow. Bug #339456

Package-Manager: portage-2.2_rc86/cvs/Linux x86_64

4 files changed, 68 insertions, 6 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/Manifest b/net-analyzer/netwatch/Manifest
index f17461f9fb04..47cf8c5b8c6c 100644
--- a/net-analyzer/netwatch/Manifest
+++ b/net-analyzer/netwatch/Manifest
@@ -2,15 +2,17 @@
 Hash: SHA1
 
 AUX append_ldflags.patch 691 RMD160 a6199e31ebe8f232a8b958434f8982c28c6b9cde SHA1 9601b5c576c4d23d261e5f5d28dab3b5aaf4c693 SHA256 5c5658cb328a2ae618c691423331a0342a89c6c2bdeb391c15f6d1fef3aa9a60
+AUX netwatch-1.3.0.1-fix-fortify.patch 445 RMD160 abcc6481970f9a89676803c02b29eaf45cde2e2c SHA1 3323797096d3ac1862a89c1b431e79d625f505d0 SHA256 8cf7895078737ba11a47a7b3f74503a7f78fcd6b456b33be2644639544369f27
 AUX netwatch.c.patch 548 RMD160 b092cdea55efb3a0fac7cf6988ac748a292e828e SHA1 712ec1cd85ca6a774a28d8218c2a54362dc0a69c SHA256 f114d8d78434c99d56352a48e3f8e0eca02274dfe813d063dca2d827908414cc
 DIST netwatch-1.3.0-1.tgz 187936 RMD160 420f4007742ab52e6296f30754b705344ea5a7c8 SHA1 bb8c27ad2f1cb106d2cf079d9558189e0030d2f6 SHA256 9fedc77e271cb3c3054e78f219962d5190294a90d4768797e06c6cd3fc8bd02d
+EBUILD netwatch-1.3.0.1-r1.ebuild 1060 RMD160 c0d1532b82e3da7230b16ca0a1e994dce6c4f14f SHA1 e54282deafc9093d666eac555c8095765546948e SHA256 f71cd34f50c8feff333383ef33925540e34ea3b95f45c8ef8762f7d65c307eda
 EBUILD netwatch-1.3.0.1.ebuild 1008 RMD160 92eb05e4f73e41e958d5bccdd59eaa1a74405afa SHA1 46e77ab49d06e04cf2519075b099c977c0b9d336 SHA256 451eb1b3eb91a23ad9f3ac65f648ec29574363db89dc22b6136c5e011222ca1c
-MISC ChangeLog 719 RMD160 6f0cf2ad824f717ed9adefe7c71a4f78a44c9dd4 SHA1 140fc46032baa4c25b84a8cc67a27de7944b6484 SHA256 83664a49dd4dbba03cda65d2e54214b849957572101b910b90f2e9ec3f4dc798
+MISC ChangeLog 945 RMD160 23d34263688867812c9ed94811397aa2797c1621 SHA1 146251900ec19d3dc707c6796c8f1be32f81202c SHA256 478ed5853aa9fed8b3444f8dc044fef4ed738f3b642f1696a7953790d4ce50ed
 MISC metadata.xml 298 RMD160 d7b61ed46d52909488566dbdea17585397180470 SHA1 1677d5235c744d6fb1459f6a2f8ec42cbd88e479 SHA256 f16ad35ac7b06c1f3e28a204c431fa2b75044190c98310f8f7ddfc62a34c3fc2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkwo/G4ACgkQNQqtfCuFnePFqACffDo1yY1zqnCPpniQSc5scTXt
-pIAAmQH7FPqxY6KPSrsKS/IQdW6BTryJ
-=beuq
+iEYEARECAAYFAkyrZ+MACgkQ9/cejkQaxBB5bgCePBr2uHM812QZACxguxZ4dUNe
+6cgAnRgViL53d7PQCiUWR0jzqp89e7pz
+=KxPO
 -----END PGP SIGNATURE-----
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
+}