Fix a small off-by-one error per bug #139640 thanks to basic@mozdev.org for the patch

Package-Manager: portage-2.1.2-r1

diff --git a/net-analyzer/bmon/Manifest b/net-analyzer/bmon/Manifest
index 0287d1ce12a8a0f1111e1d357e1d88c149c487b7..b1761ae9f4579329e86e0b52ce34ba9637091a43 100644 (file)
--- a/net-analyzer/bmon/Manifest
+++ b/net-analyzer/bmon/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bmon-2.1.0-gcc4.diff 732 RMD160 736a050b4fe592cfabcc6c7c9359092bf6799d3b SHA1 d130a87f994e05d3f71b593f2b4e9cf64b826e82 SHA256 9b4c1e57ffbbc3cd2e8c80d985960c59eb00c1c894f1df9caf12b99f4c893ade
 MD5 6b5f014b7739049db269b0d04eddcb63 files/bmon-2.1.0-gcc4.diff 732
 RMD160 736a050b4fe592cfabcc6c7c9359092bf6799d3b files/bmon-2.1.0-gcc4.diff 732
@@ -12,14 +15,14 @@ EBUILD bmon-2.1.0-r2.ebuild 1012 RMD160 1a517cf2b6e360ad150a0f1980fec6e465e48df6
 MD5 83a1bb17e83a16cb423004a76f42c708 bmon-2.1.0-r2.ebuild 1012
 RMD160 1a517cf2b6e360ad150a0f1980fec6e465e48df6 bmon-2.1.0-r2.ebuild 1012
 SHA256 1a4dcc79d26cca374fb1ab8cdae1a000e247208fa91b79f332bc8a1ea725a7ed bmon-2.1.0-r2.ebuild 1012
-EBUILD bmon-2.1.0.ebuild 1071 RMD160 75de4a842a9a3d5dc8f713846ec528f835a0608a SHA1 55e5d4d623327e3d34a590530d24f3b168f65c78 SHA256 4aa86c7dd0c84de4b913329807700b0e5885d5baceec232c9150791e5a3c11b5
-MD5 ff6ae62ffc745b5597d36133b06b6a46 bmon-2.1.0.ebuild 1071
-RMD160 75de4a842a9a3d5dc8f713846ec528f835a0608a bmon-2.1.0.ebuild 1071
-SHA256 4aa86c7dd0c84de4b913329807700b0e5885d5baceec232c9150791e5a3c11b5 bmon-2.1.0.ebuild 1071
-MISC ChangeLog 4059 RMD160 3bd8460959d3634ada6f22d124168e52533191ea SHA1 cc8339c89fe619565afeb4070f2c4dc7da99c865 SHA256 6aeb687339b94eb8332937984876c3ce42e85ef232c19094000b783e4815fa2b
-MD5 ce997acccccf85813e4e22e8f11d67e0 ChangeLog 4059
-RMD160 3bd8460959d3634ada6f22d124168e52533191ea ChangeLog 4059
-SHA256 6aeb687339b94eb8332937984876c3ce42e85ef232c19094000b783e4815fa2b ChangeLog 4059
+EBUILD bmon-2.1.0.ebuild 1065 RMD160 1a0736c1d9f3c6f6f21863dcd6a78e680044e3ea SHA1 145ee5567adf34c8ef6a0d5f2466c4ebb3618a61 SHA256 7414fdcbdf66a2739655269f247e2a5dd6462c2ae29504947d8c4ebe29e3c25f
+MD5 7896eb35166fc5bad7b1ea2cdd8a743a bmon-2.1.0.ebuild 1065
+RMD160 1a0736c1d9f3c6f6f21863dcd6a78e680044e3ea bmon-2.1.0.ebuild 1065
+SHA256 7414fdcbdf66a2739655269f247e2a5dd6462c2ae29504947d8c4ebe29e3c25f bmon-2.1.0.ebuild 1065
+MISC ChangeLog 4177 RMD160 fb7da061e5f75348f0edb691575a8bad24ff3768 SHA1 814f04ff420ac4d9b6136a6ce9f824a4d6bafd26 SHA256 7c6a6e5f82b45cd5b8538601e5417c717ff8cab08b8096a76fe5633ba40f76f3
+MD5 45bc1cb18715c68c80d0bf2000c7c332 ChangeLog 4177
+RMD160 fb7da061e5f75348f0edb691575a8bad24ff3768 ChangeLog 4177
+SHA256 7c6a6e5f82b45cd5b8538601e5417c717ff8cab08b8096a76fe5633ba40f76f3 ChangeLog 4177
 MISC metadata.xml 233 RMD160 4ebadbc3b5e818b45feb3bfdccc5613503e0679f SHA1 4c351bbca92efa8abb682eafe358ef72f6427fde SHA256 d76ab458c17254d148b12fb21c5d4399afa9108768b00022942a8b646fe0b598
 MD5 5fbd67ef2e49ca1d630675f7c46fae5c metadata.xml 233
 RMD160 4ebadbc3b5e818b45feb3bfdccc5613503e0679f metadata.xml 233
@@ -30,3 +33,10 @@ SHA256 ea2c1eb220170cd49b3799cffb1d73aeae92598f0d3e72188719f558ff5afc20 files/di
 MD5 41c99e69f43c0c98d0460aac85fc7989 files/digest-bmon-2.1.0-r2 232
 RMD160 00c92c2db673b20ec5a772ad480c8693f99ee7f5 files/digest-bmon-2.1.0-r2 232
 SHA256 bf6f7b61bfd50ba5d4d87d4a758d078cd636f8d2170f80b2dd5df2deb6e6cc73 files/digest-bmon-2.1.0-r2 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
+
+iD8DBQFFwj0LKRy60XGEcJIRAlIjAKCAVMAaEhmzFTCQUwxqSxa1KBhDeQCZAXYj
+bN4rEvS0xwWRj0qE3BzXaJg=
+=FEq+
+-----END PGP SIGNATURE-----

diff --git a/net-analyzer/nettop/ChangeLog b/net-analyzer/nettop/ChangeLog
index c094a85f83fe80c2d0769f63f16415c907bf77c3..697a2bfed98709cad62ade7cbf1e9c987e30a9cb 100644 (file)
--- a/net-analyzer/nettop/ChangeLog
+++ b/net-analyzer/nettop/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/nettop
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nettop/ChangeLog,v 1.15 2006/07/28 06:12:25 dragonheart Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nettop/ChangeLog,v 1.16 2007/02/01 19:17:45 jokey Exp $
+
+*nettop-0.2.3-r1 (01 Feb 2007)
+
+  01 Feb 2007; Markus Ullmann <jokey@gentoo.org>
+  +files/nettop-0.2.3-gcc411.patch, +files/nettop-0.2.3-offbyone.patch,
+  -files/nettop.c.patch, -nettop-0.2.3.ebuild, +nettop-0.2.3-r1.ebuild:
+  Fix a small off-by-one error per bug #139640 thanks to basic@mozdev.org for
+  the patch
 
   28 Jul 2006; Daniel Black <dragonheart@gentoo.org> nettop-0.2.3.ebuild:
   slang dependency fix as per bug #141947 thanks Diego

diff --git a/net-analyzer/nettop/Manifest b/net-analyzer/nettop/Manifest
index 4cd392c7ef646eecc82558ac1996b5aa39b51d0f..75b025b2fe44a77924989f45a33d1b9f5a244ccc 100644 (file)
--- a/net-analyzer/nettop/Manifest
+++ b/net-analyzer/nettop/Manifest
@@ -1,30 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX nettop.c.patch 1093 RMD160 3c820d08ba12b8702136db4edf483dc21b11770d SHA1 43b1bd43d1adb393f319faaee7a1c5b4aa5bc7a3 SHA256 0f99b910fd27312b1e482845d05c190bb09928aad40f7173f160ca9ebd434299
-MD5 6f3688a56b586f55a6dd4b1d7f8452e6 files/nettop.c.patch 1093
-RMD160 3c820d08ba12b8702136db4edf483dc21b11770d files/nettop.c.patch 1093
-SHA256 0f99b910fd27312b1e482845d05c190bb09928aad40f7173f160ca9ebd434299 files/nettop.c.patch 1093
+AUX nettop-0.2.3-gcc411.patch 1093 RMD160 3c820d08ba12b8702136db4edf483dc21b11770d SHA1 43b1bd43d1adb393f319faaee7a1c5b4aa5bc7a3 SHA256 0f99b910fd27312b1e482845d05c190bb09928aad40f7173f160ca9ebd434299
+MD5 6f3688a56b586f55a6dd4b1d7f8452e6 files/nettop-0.2.3-gcc411.patch 1093
+RMD160 3c820d08ba12b8702136db4edf483dc21b11770d files/nettop-0.2.3-gcc411.patch 1093
+SHA256 0f99b910fd27312b1e482845d05c190bb09928aad40f7173f160ca9ebd434299 files/nettop-0.2.3-gcc411.patch 1093
+AUX nettop-0.2.3-offbyone.patch 777 RMD160 b626baba312518ad2b2141e5cf344e3142a30212 SHA1 9b0654a4d0afcdb2990dee74e41b199735b2a90c SHA256 8b3767bce47ef8b7fb2d8eeae2a47e34a05d75037004f723d955da47861f4048
+MD5 6c68d10a63b22380ceb98296cb830f11 files/nettop-0.2.3-offbyone.patch 777
+RMD160 b626baba312518ad2b2141e5cf344e3142a30212 files/nettop-0.2.3-offbyone.patch 777
+SHA256 8b3767bce47ef8b7fb2d8eeae2a47e34a05d75037004f723d955da47861f4048 files/nettop-0.2.3-offbyone.patch 777
 DIST nettop-0.2.3.tar.gz 22797 RMD160 c3c52ac98f3507046af9c62fad93e9abb3af76cd SHA1 71b28b190c413caf3864dda5fca679ad305fec42 SHA256 4dbb2bdb506c4a5a49d67fbd7bcc860008a881abe55271cf3651316620143556
-EBUILD nettop-0.2.3.ebuild 750 RMD160 174d70699c8a7b5cd780e2cc3bbb956b4acdf8ea SHA1 51af5d5ec01539e22674ca8984d70baf7e5a2a65 SHA256 84c3c6f9895526a050c1f2e917996294a1ac062d19b037b23c510a0b9c080ecf
-MD5 4cd8f0475149877eae13f445fc4a34e9 nettop-0.2.3.ebuild 750
-RMD160 174d70699c8a7b5cd780e2cc3bbb956b4acdf8ea nettop-0.2.3.ebuild 750
-SHA256 84c3c6f9895526a050c1f2e917996294a1ac062d19b037b23c510a0b9c080ecf nettop-0.2.3.ebuild 750
-MISC ChangeLog 1931 RMD160 644fa1cda67a247e1065ba31b1ddae5333de5c91 SHA1 1e709be82249633e43f001ae264972d3a919416c SHA256 d1bed80a8d76eb0a8167c94a064bc72ede21a04d5846846876b51735be047be7
-MD5 f8a27dc3659503d02f462bfa83bf2a84 ChangeLog 1931
-RMD160 644fa1cda67a247e1065ba31b1ddae5333de5c91 ChangeLog 1931
-SHA256 d1bed80a8d76eb0a8167c94a064bc72ede21a04d5846846876b51735be047be7 ChangeLog 1931
+EBUILD nettop-0.2.3-r1.ebuild 818 RMD160 6b66c91020c05f57c96dd11e981470090a71279a SHA1 97f7637a3fb1fe4530b798ebbffbae3b3db0ebb4 SHA256 1b068940655a12eec4084b9c258d47273b2267e5d8ed4bea1e1ae7c840f3e8eb
+MD5 d60764eb0accba5636fda4af92eda046 nettop-0.2.3-r1.ebuild 818
+RMD160 6b66c91020c05f57c96dd11e981470090a71279a nettop-0.2.3-r1.ebuild 818
+SHA256 1b068940655a12eec4084b9c258d47273b2267e5d8ed4bea1e1ae7c840f3e8eb nettop-0.2.3-r1.ebuild 818
+MISC ChangeLog 2241 RMD160 5c3ed2128a091ef3620a62a75d115cc8fe97849b SHA1 5031f303f675512634792710a3d4e9e881dbab44 SHA256 f01dcc401b7b889bfb9503f2e814f3907aefa6c343ec534c7d0a5d0e29b5709f
+MD5 c14d940bf83bc978d1947e97105677fb ChangeLog 2241
+RMD160 5c3ed2128a091ef3620a62a75d115cc8fe97849b ChangeLog 2241
+SHA256 f01dcc401b7b889bfb9503f2e814f3907aefa6c343ec534c7d0a5d0e29b5709f ChangeLog 2241
 MISC metadata.xml 232 RMD160 d0a563d04a07ed7c8d51c751c5a60767d212c627 SHA1 c7780f13c86e6b46cb81404036d18cc47b61cf1f SHA256 76dc0e7af177a747308be4f49e5c99ee80d9a667ba50f53e53093481209dc063
 MD5 59fafa99faf187e744c602a625052f65 metadata.xml 232
 RMD160 d0a563d04a07ed7c8d51c751c5a60767d212c627 metadata.xml 232
 SHA256 76dc0e7af177a747308be4f49e5c99ee80d9a667ba50f53e53093481209dc063 metadata.xml 232
-MD5 95059b5d4d176936d0854d509b476de8 files/digest-nettop-0.2.3 235
-RMD160 5640e89178c448d5d37c46b0ed495a7277c348ab files/digest-nettop-0.2.3 235
-SHA256 2677d65c0c26b6cfbd5703b22aff114e9ef71c0563157710ad0e6ab148f53da7 files/digest-nettop-0.2.3 235
+MD5 95059b5d4d176936d0854d509b476de8 files/digest-nettop-0.2.3-r1 235
+RMD160 5640e89178c448d5d37c46b0ed495a7277c348ab files/digest-nettop-0.2.3-r1 235
+SHA256 2677d65c0c26b6cfbd5703b22aff114e9ef71c0563157710ad0e6ab148f53da7 files/digest-nettop-0.2.3-r1 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFEyaw5mdTrptrqvGERAkJIAJ4r3K+NzuPBfOfHP6ZALPluK8wk2gCcDYHq
-JpTTAMRM40+8yk5Mw1Xy1L0=
-=7/56
+iD8DBQFFwjzDz974XjDVpbkRAmrmAKDFHVWlNVGQ6g824S3haBpT45ezTQCfYcYI
+Z7z8eNmu9+Dgz4kIOwGZf34=
+=/a6H
 -----END PGP SIGNATURE-----

diff --git a/net-analyzer/nettop/files/digest-nettop-0.2.3 b/net-analyzer/nettop/files/digest-nettop-0.2.3-r1
similarity index 100%
rename from net-analyzer/nettop/files/digest-nettop-0.2.3
rename to net-analyzer/nettop/files/digest-nettop-0.2.3-r1

diff --git a/net-analyzer/nettop/files/nettop.c.patch b/net-analyzer/nettop/files/nettop-0.2.3-gcc411.patch
similarity index 100%
rename from net-analyzer/nettop/files/nettop.c.patch
rename to net-analyzer/nettop/files/nettop-0.2.3-gcc411.patch

diff --git a/net-analyzer/nettop/files/nettop-0.2.3-offbyone.patch b/net-analyzer/nettop/files/nettop-0.2.3-offbyone.patch
new file mode 100644 (file)
index 0000000..0903eba
--- /dev/null
+++ b/net-analyzer/nettop/files/nettop-0.2.3-offbyone.patch
@@ -0,0 +1,29 @@
+--- nettop.c.old       2006-07-08 13:24:40.000000000 +0000
++++ nettop.c   2006-07-08 14:03:42.000000000 +0000
+@@ -384,7 +385,7 @@
+ void
+ screen_update()
+ {
+-      struct node *sorted[24] = {0};
++      struct node *sorted[25] = {0};
+       unsigned long long sump, sums, valp, vals;
+       unsigned long long xfrrate = 0;
+       int i, do_ipprint, last[3] = {0};
+@@ -512,7 +513,7 @@
+ void
+ ipprint(int last[])
+ {
+-      struct node *sorted[24] = {0};
++      struct node *sorted[25] = {0};
+       struct ent *proto;
+       unsigned long long valp, vals, sump, sums;
+       unsigned long long xfrrate = 0;
+@@ -575,7 +576,7 @@
+ void
+ servprint(int last[], struct node *tree, int type)
+ {
+-      struct node *sorted[24] = {0};
++      struct node *sorted[25] = {0};
+       struct ent *e;
+       struct ent *service;
+       unsigned long long vals, valp, sums, sump;

diff --git a/net-analyzer/nettop/nettop-0.2.3.ebuild b/net-analyzer/nettop/nettop-0.2.3-r1.ebuild
similarity index 67%
rename from net-analyzer/nettop/nettop-0.2.3.ebuild
rename to net-analyzer/nettop/nettop-0.2.3-r1.ebuild
index 904cda05aeafa203f65039d314c56e0c0b44925a..c3de675784ce54ff362814e21e9584aa089340c7 100644 (file)
--- a/net-analyzer/nettop/nettop-0.2.3.ebuild
+++ b/net-analyzer/nettop/nettop-0.2.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nettop/nettop-0.2.3.ebuild,v 1.15 2006/07/28 06:12:25 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nettop/nettop-0.2.3-r1.ebuild,v 1.1 2007/02/01 19:17:45 jokey Exp $
 
 inherit eutils
 
@@ -20,17 +20,18 @@ DEPEND="=sys-libs/slang-1*
 src_unpack() {
        unpack ${A}
        cd "${S}"
-       epatch "${FILESDIR}"/nettop.c.patch
+       epatch "${FILESDIR}"/${P}-gcc411.patch
+       epatch "${FILESDIR}"/${P}-offbyone.patch
 }
 
 src_compile() {
        local myconf
        myconf="--prefix=/usr"
-       ./configure ${myconf} || die
-       emake || die
+       ./configure ${myconf} || die "configure failed"
+       emake || die "emake failed"
 }
 
 src_install() {
-       dosbin nettop || die
+       dosbin nettop
        dodoc ChangeLog README THANKS
 }