Fix overflow identified by Vicente Olivert Riera in bug #441420; use a patch instead of a chain of seds for the makefile changes, which also saves us from using flag-o-matic.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

5 files changed, 108 insertions, 2 deletions

diff --git a/net-analyzer/bwmon/ChangeLog b/net-analyzer/bwmon/ChangeLog
index 83027f9e463b..d6bf08dca6b4 100644
--- a/net-analyzer/bwmon/ChangeLog
+++ b/net-analyzer/bwmon/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/bwmon
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwmon/ChangeLog,v 1.21 2012/11/04 20:22:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwmon/ChangeLog,v 1.22 2012/11/05 02:58:44 flameeyes Exp $
+
+*bwmon-1.3-r2 (05 Nov 2012)
+
+  05 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org> +bwmon-1.3-r2.ebuild,
+  +files/bwmon-1.3-build.patch, +files/bwmon-1.3-overflow.patch:
+  Fix overflow identified by Vicente Olivert Riera in bug #441420; use a patch
+  instead of a chain of seds for the makefile changes, which also saves us from
+  using flag-o-matic.
 
   04 Nov 2012; Agostino Sarubbo <ago@gentoo.org> bwmon-1.3-r1.ebuild:
   Stable for amd64, wrt bug #441420
diff --git a/net-analyzer/bwmon/Manifest b/net-analyzer/bwmon/Manifest
index b299e873bb7b..625c594226ba 100644
--- a/net-analyzer/bwmon/Manifest
+++ b/net-analyzer/bwmon/Manifest
@@ -1,6 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX bwmon-1.3-build.patch 609 SHA256 6f3daf755637b2de02519483014d41e7c01a9d95ca45c9cf16cc4ba6f9424790 SHA512 927fe1cbf9ee13c9f0da560fd6034b5887cd1572d44b9921f1675c3c7b64d43906e571da98b3fae59fe924450c3061167e33213e940ded948126c8f16d6d36cf WHIRLPOOL b6d6cf455a0fd44c31d78817def0de5fd59816fe7af11febeddbe28063d20bb9fed56fef0be17a48a449cbaa2469790eee458bbd0f6dec89c0118898d3f9508a
+AUX bwmon-1.3-overflow.patch 661 SHA256 21be6810afe66ecab01585cdce7cca6e569ec13bbed4c77066bf7e03db034355 SHA512 0f5616f18ffb8824b364b01a6c8dda336b5039857a703fe5b8224ca02eff2ffaef66d720cf7ab4d8bf546fe778b9df3c9ec3eb8d14616bdf702628cf314545c8 WHIRLPOOL 6368236e8267e113982321f86c2418410b13f226a766ca841bfc28603edf7345af0ac663c838a60b174064329553d36e694856d85b77e55796b4ec436fbad103
 AUX bwmon-1.3-typo-fix.patch 690 SHA256 7a6a5651571163953339d4e4ea00a67f909227559eaa1ea636fabd0039c3da0e SHA512 f0f89d7c6cabacf3a2f549c35b8c7a76b564061997333967759ad29d9ca6f892c261f514b55d68b01de13520777a0b9b96823f0113790c1a0a6118b4b3481999 WHIRLPOOL 3d8cc387722c5f61187f39cdf1e4291e88bd5848fd3b4bf464e48a4b36ab143dd8653f18b887ad89157a77b104bc266a972630308207301734b01ccdc53c10b8
 DIST bwmon-1.3.tar.gz 5668 SHA256 624381208d0faae6c123bc6198a59d6c4316cd4fffb1ba5aca206374f5a42df6 SHA512 6552ba03f0cfe7d2adebe7ae49379cc109b4f8da56dafec1264ac39c114809c7cde161f6321a67516b22b04abbad5d1ab3b4efb313479ad131fb20638c6871e8 WHIRLPOOL 1b05208fdae45881b3175f5f84fe5d816c1d0db182ccb34be1b61e3f2e14bde5cb627dda0ded10cb1f21490277eb6d5c3cd3456001854e0dd418cca6d63cb8d1
 EBUILD bwmon-1.3-r1.ebuild 1148 SHA256 45da6bbbcbdbe09a0974b110efd64b4ec0fa7ad21dfccd8be48a1598c923c6cd SHA512 d30f563303dd15c595f7829eabe3a7881398632954940d5aee66be3f564a1a0d94599949a04f16b2de7f384ce81abc98ac82f0a76eba755ffb8c74f234b0da87 WHIRLPOOL e27814b3dc2322ca4712f944a3557482b0c2ca0fb13f128d2f96dd8a6386825fc5f226eea55a82b34b6924b297bd5f56fed55ba12a9e87cec226bc84a89ede03
+EBUILD bwmon-1.3-r2.ebuild 815 SHA256 9ea782e16b363a41da428ffda24a52c947ae7e8c9ac41592fb42936b2514c6ad SHA512 76f71e5174afadc82b0990d5e0b0275f64be5ca008ba7abd87d07c2c05197fe92c8917d756e41704771e54b022eac65af05097bfe730eb9a26e053137cbc9b05 WHIRLPOOL ff78e759ce513d6df0f4eafd11fc75e32c2f79d43c4494a69102a69241436dea3bc548cfaa830a2c37f300e879aad1cfbe22d1303db6b0362d5b81d0d17e82bd
 EBUILD bwmon-1.3.ebuild 799 SHA256 0f86cc53401ab75461c5005955ed575c1b89bcde7ebdefa486fa1607105c7649 SHA512 df296f773b2cdadd5878189ccdde95eb628ddc098463812d2a5bd3b63307c1e5464a22e70bd5e900a711091ae17dfd50579efea2c49ee922ec9fb80d2f4691bd WHIRLPOOL d2035b4be9fba1e71f3bc25344b9b46603395bc2d8b2da190bd5d036b6332be73b1db6e685707fe420f67a22622787821e6163fd9a106a10b78ed2df94e5dacf
-MISC ChangeLog 2438 SHA256 db8092a21b4c71d29b45b8d2087d10becc0144a5e2d5418ed346bfdeb8e50b89 SHA512 248b86930805ac4518d78459b0d96d87ea3326f9468bdd0fa39d8386a8da8e05dab5eda8889b7576d4b8a8ccebc9cd898c06b8c949143c638fdfe9ba856ab645 WHIRLPOOL 7a719a7a45f750a37d62f40f32b3e6faa4d38b708c603c6f4fc30a8825e590ff2d5611c3bd762a1b4e5c338f681315a178d332708bded2ba650645e4cb83d2a4
+MISC ChangeLog 2798 SHA256 c9fac2e358f9c62cd1a8e67808f9c1adbbc3d872fc3e2b11d519988ced7d2412 SHA512 3dbea0ee72ab1af14eecb9a4555d2fcfe986c48b382d76abfdd05450e9243ea67728fc194d6caaea2420f091b340b6b5d22151f888774ed4b1becd54432e68cb WHIRLPOOL 36b6cd0475a544862aa9a22382b7e168cdfefb64ab646b5cbc3fd291ac8d3180237b38041a2f7e9b7c416d86a3042f2d7c9c1a20d4e61e3bfe2357d2eaf4f0f1
 MISC metadata.xml 227 SHA256 465609212401299513731252063d93eb272a2b61f65e3db84a6d38d229040d85 SHA512 c3c60cfe804de3ff89e7ea17f9e4eb173a24bec5d6a261fafa55c5a432321a6c6a614972c030cb95ca62b6f6e4dad08a431b954160854a33b8e20a6eca18d2d7 WHIRLPOOL 5ff792d572923dc4ad13942685ca34407c0d050388d4b6ce40c1b5b26502a49c16a9be45954c5c92c9851f7f0a1e1422badedf1a4ab804dd06c9e72cc5629e25
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQlytqAAoJEBzRPIrUMBNC3OIH/RuBB0bLlJfmE86Yh35JBfXX
+sMj22UznGbnc+JKrKAZvtv+6LhXXOpxBz1TCo/cYDYFJ90exMMlufT1oFxYt1ZeQ
+B9TFLKx9fk5U780S1cbZPiD3Ttfsi/3BXwFDg5oxSu+Ga7z+msbXkXVH8+r4fi03
+PLMpaVLuVD7vDs1yylqPxogptq8/bi/5D2N5W9YiB0ScARdqoeOABlk97bEWRDJl
+G5RQ65lxNSXyg9+6GxSO9t1qmZXRkq24tRnKIp0gHqNoz7FD128yOSygT0AEJVkx
+bUFtmh5ZJlW5Y2sRX7+lpXEbhNcxaRw7war4dtokOL3nJjL75zK3sL47Dq/KD5c=
+=7RUc
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/bwmon/bwmon-1.3-r2.ebuild b/net-analyzer/bwmon/bwmon-1.3-r2.ebuild
new file mode 100644
index 000000000000..70bcf33f8b06
--- /dev/null
+++ b/net-analyzer/bwmon/bwmon-1.3-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwmon/bwmon-1.3-r2.ebuild,v 1.1 2012/11/05 02:58:44 flameeyes Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Simple ncurses bandwidth monitor"
+HOMEPAGE="http://bwmon.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}"
+
+SLOT="0"
+LICENSE="GPL-2 public-domain"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+	# Fix a typo in help wrt bug #263326
+	epatch "${FILESDIR}"/${P}-typo-fix.patch
+	epatch "${FILESDIR}"/${P}-overflow.patch
+}
+
+src_compile() {
+	emake -Csrc CC="$(tc-getCC)"
+}
+
+src_install () {
+	dobin ${PN}
+	dodoc README
+}
diff --git a/net-analyzer/bwmon/files/bwmon-1.3-build.patch b/net-analyzer/bwmon/files/bwmon-1.3-build.patch
new file mode 100644
index 000000000000..336cf66445ec
--- /dev/null
+++ b/net-analyzer/bwmon/files/bwmon-1.3-build.patch
@@ -0,0 +1,24 @@
+Index: bwmon-1.3/src/Makefile
+===================================================================
+--- bwmon-1.3.orig/src/Makefile
++++ bwmon-1.3/src/Makefile
+@@ -10,8 +10,8 @@ CC = gcc
+ RM = /bin/rm
+ INSTALL = install
+ 
+-CFLAGS = -I../include -Wall -D__THREADS
+-LDFLAGS = -lpthread -lncurses 
++CFLAGS += -I../include -Wall -D__THREADS
++LIBS = -lpthread -lncurses 
+ 
+ SRC = bwmon.c
+ OBJS = $(SRC:.c=.o)
+@@ -19,7 +19,7 @@ OBJS = $(SRC:.c=.o)
+ all: bwmon
+ 
+ bwmon: $(OBJS)
+-	$(CC) $(LDFLAGS) -o ../$@ $(OBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o ../$@ $(OBJS) $(LIBS)
+ 
+ clean:
+ 	@for i in $(OBJS) *~ core bwmon; do \
diff --git a/net-analyzer/bwmon/files/bwmon-1.3-overflow.patch b/net-analyzer/bwmon/files/bwmon-1.3-overflow.patch
new file mode 100644
index 000000000000..a6280ffa6c29
--- /dev/null
+++ b/net-analyzer/bwmon/files/bwmon-1.3-overflow.patch
@@ -0,0 +1,22 @@
+Index: bwmon-1.3/src/bwmon.c
+===================================================================
+--- bwmon-1.3.orig/src/bwmon.c
++++ bwmon-1.3/src/bwmon.c
+@@ -408,7 +408,7 @@ bool_t
+ print_uptime(float * uptime) 
+ {
+ 	unsigned int tmp = 0, hour = 0, min = 0, sec = 0;
+-	char hostname[30];
++	char hostname[50];
+ 
+ 	tmp = (uint)(*uptime);
+ 	sec = tmp % 60;
+@@ -418,7 +418,7 @@ print_uptime(float * uptime)
+ 	hour = tmp % 24;
+ 	tmp = (tmp - hour) / 24;
+ 
+-	if (gethostname(hostname, strlen(hostname)) != 0)
++	if (gethostname(hostname, sizeof(hostname)) != 0)
+ 		strcpy(hostname, "System");
+ 
+ 	printw("\n%s uptime: %u day%c %u hour%c %u minutes and %u seconds\n",