Fixed glibc 2.4 compatibility wrt bug #126743

(Portage version: 2.1_pre7-r1)

5 files changed, 151 insertions, 1 deletions

diff --git a/net-analyzer/nstats/ChangeLog b/net-analyzer/nstats/ChangeLog
index 9a79ed49fb80..580a00ef5988 100644
--- a/net-analyzer/nstats/ChangeLog
+++ b/net-analyzer/nstats/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nstats
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nstats/ChangeLog,v 1.13 2006/02/15 23:39:26 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nstats/ChangeLog,v 1.14 2006/03/27 00:41:43 jokey Exp $
+
+*nstats-0.4-r1 (27 Mar 2006)
+
+  27 Mar 2006; Markus Ullmann <jokey@gentoo.org>
+  +files/nstats-0.4-glibc24.patch, +nstats-0.4-r1.ebuild:
+  Fixed glibc 2.4 compatibility wrt bug #126743
 
   15 Feb 2006; Markus Ullmann <jokey@gentoo.org> nstats-0.4.ebuild:
   Removing virtual/libpcap wrt bug #117898
diff --git a/net-analyzer/nstats/Manifest b/net-analyzer/nstats/Manifest
index 7f58d38486e5..b4d4818ad67d 100644
--- a/net-analyzer/nstats/Manifest
+++ b/net-analyzer/nstats/Manifest
@@ -4,12 +4,21 @@ SHA256 65acb5109b06b6e6592a1445a2c047bc3b047ab706cb89ec92e9820d1cf52975 ChangeLo
 MD5 436fb40a1859860df36dbcf6ba534dcc files/digest-nstats-0.4 61
 RMD160 30b645ccb89cd6d59cfd5dc23d11f432f3898d0d files/digest-nstats-0.4 61
 SHA256 977bb8010361c1afd5d29690ea37d8364f8955e2f0febf266f9b8c8e1260bb08 files/digest-nstats-0.4 61
+MD5 c44a4bb186aefabd816c98aba871a76f files/digest-nstats-0.4-r1 229
+RMD160 396f71ec919c227ea946afdf2b3d1d9c9abf7056 files/digest-nstats-0.4-r1 229
+SHA256 7a6c4ec9daa51dfd97c42dd9d9b463aa92cec1fccfee938cc8b9d01eca461281 files/digest-nstats-0.4-r1 229
+MD5 24702730158adb6e47d76c5741d255a0 files/nstats-0.4-glibc24.patch 4942
+RMD160 18aa09abdad5e3362e44d6996a052d4b6dfba04c files/nstats-0.4-glibc24.patch 4942
+SHA256 44cfd1b52bfec1170baaae542b91c85e2ce531e6b7c114365e4b635dfd141256 files/nstats-0.4-glibc24.patch 4942
 MD5 9f496f20339069acfc493469277a05bb files/nstats-0.4-makefile.patch 478
 RMD160 1dfe60fd1d279c41e739f9cc75109b6681780d6f files/nstats-0.4-makefile.patch 478
 SHA256 9aa20d2b54bb9e5027c20d7c33003bb2ada0cdd9b029890f73608feb2b8599f7 files/nstats-0.4-makefile.patch 478
 MD5 471824686805ceb0bc7fbffbfe341a4b metadata.xml 266
 RMD160 969673ed0966bf0d1e582411b1cb0785e816cc59 metadata.xml 266
 SHA256 730f6ab624d9d75e5188f993ab63c993c78f5afe268d50da67c525e4162bbe48 metadata.xml 266
+MD5 b0802bb41850c87c2783301da0543ee8 nstats-0.4-r1.ebuild 850
+RMD160 2ca815dd324d953f95de9b583089db5558902d8a nstats-0.4-r1.ebuild 850
+SHA256 47f987955af7d113651475be2dc96949bdde55144925bcb023b16d2f7b51ca36 nstats-0.4-r1.ebuild 850
 MD5 17e4f3fd5a69b3d5c3c4f0c4202e33ab nstats-0.4.ebuild 760
 RMD160 fcab34856e0962ef490cf77bb146c05c3409374c nstats-0.4.ebuild 760
 SHA256 d122aa16bb2d0a9b4be9fe6a2ec08d26b0d6b75a4e4bf342a3db6f129053fdc4 nstats-0.4.ebuild 760
diff --git a/net-analyzer/nstats/files/digest-nstats-0.4-r1 b/net-analyzer/nstats/files/digest-nstats-0.4-r1
new file mode 100644
index 000000000000..1cd6129b6dad
--- /dev/null
+++ b/net-analyzer/nstats/files/digest-nstats-0.4-r1
@@ -0,0 +1,3 @@
+MD5 92e737781d918ae68fd27b5fa16d5dec nstats-0.4.tar.gz 71526
+RMD160 af5f7f5b3bc1be052d2b979d890f7b14d959d87b nstats-0.4.tar.gz 71526
+SHA256 ab36626ca06e734800a31ec64f76bf1dc0d9e579f3542155a7ce89030f74aaf4 nstats-0.4.tar.gz 71526
diff --git a/net-analyzer/nstats/files/nstats-0.4-glibc24.patch b/net-analyzer/nstats/files/nstats-0.4-glibc24.patch
new file mode 100644
index 000000000000..053efdcb8ec7
--- /dev/null
+++ b/net-analyzer/nstats/files/nstats-0.4-glibc24.patch
@@ -0,0 +1,102 @@
+--- ./nstats-0.4.orig/src/packet.c	2002-05-02 17:34:25.000000000 +0200
++++ ./nstats-0.4/src/packet.c	2006-03-27 02:15:47.000000000 +0200
+@@ -148,9 +148,9 @@
+                     stats.ip.ipv6.icmp.dst_unreach.s_admin += hdr->len;
+                     break;
+ 
+-                case ICMP6_DST_UNREACH_NOTNEIGHBOR:
+-                    stats.ip.ipv6.icmp.dst_unreach.notneighbor++;
+-                    stats.ip.ipv6.icmp.dst_unreach.s_notneighbor += hdr->len;
++                case ICMP6_DST_UNREACH_BEYONDSCOPE:
++                    stats.ip.ipv6.icmp.dst_unreach.beyondscope++;
++                    stats.ip.ipv6.icmp.dst_unreach.s_beyondscope += hdr->len;
+                     break;
+ 
+                 case ICMP6_DST_UNREACH_ADDR:
+@@ -219,21 +219,6 @@
+             stats.ip.ipv6.icmp.s_echo_reply += hdr->len;
+             break;
+ 
+-        case ICMP6_MEMBERSHIP_QUERY:
+-            stats.ip.ipv6.icmp.mbrship_query++;
+-            stats.ip.ipv6.icmp.s_mbrship_query += hdr->len;
+-            break;
+-
+-        case ICMP6_MEMBERSHIP_REPORT:
+-            stats.ip.ipv6.icmp.mbrship_report++;
+-            stats.ip.ipv6.icmp.s_mbrship_report += hdr->len;
+-            break;
+-
+-        case ICMP6_MEMBERSHIP_REDUCTION:
+-            stats.ip.ipv6.icmp.mbrship_reduction++;
+-            stats.ip.ipv6.icmp.s_mbrship_reduction += hdr->len;
+-            break;
+-
+         case ND_ROUTER_SOLICIT:
+             stats.ip.ipv6.icmp.nd_router_solicit++;
+             stats.ip.ipv6.icmp.s_nd_router_solicit += hdr->len;
+--- ./nstats-0.4.orig/src/stats.c	2002-05-02 17:34:25.000000000 +0200
++++ ./nstats-0.4/src/stats.c	2006-03-27 02:18:41.000000000 +0200
+@@ -316,15 +316,6 @@
+     print_line("Echo Reply:", ICMP6.echo_reply, ICMP6.cnt,
+             ICMP6.s_echo_reply, ICMP6.bs, .0);
+     NEXT_ROW;
+-    print_line("MbrShip Query:", ICMP6.mbrship_query, ICMP6.cnt,
+-            ICMP6.s_mbrship_query, ICMP6.bs, .0);
+-    NEXT_ROW;
+-    print_line("MbrShip Report:", ICMP6.mbrship_report, ICMP6.cnt,
+-            ICMP6.s_mbrship_report, ICMP6.bs, .0);
+-    NEXT_ROW;
+-    print_line("MbrShip Reduct.:", ICMP6.mbrship_reduction, ICMP6.cnt,
+-            ICMP6.s_mbrship_reduction, ICMP6.bs, .0);
+-    NEXT_ROW;
+     print_line("ND Rtr Solicit:", ICMP6.nd_router_solicit, ICMP6.cnt,
+             ICMP6.s_nd_router_solicit, ICMP6.bs, .0);
+     NEXT_ROW;
+--- ./nstats-0.4.orig/src/stats.h	2002-05-02 17:34:25.000000000 +0200
++++ ./nstats-0.4/src/stats.h	2006-03-27 02:16:25.000000000 +0200
+@@ -233,7 +233,7 @@
+ 
+                     cnt_t noroute;     cnt_t s_noroute;
+                     cnt_t admin;       cnt_t s_admin;
+-                    cnt_t notneighbor; cnt_t s_notneighbor;
++                    cnt_t beyondscope; cnt_t s_beyondscope;
+                     cnt_t addr;        cnt_t s_addr;
+                     cnt_t noport;      cnt_t s_noport;
+ 
+@@ -265,9 +265,6 @@
+                 cnt_t pkt_too_big;         cnt_t s_pkt_too_big;
+                 cnt_t echo_request;        cnt_t s_echo_request;
+                 cnt_t echo_reply;          cnt_t s_echo_reply;
+-                cnt_t mbrship_query;       cnt_t s_mbrship_query;
+-                cnt_t mbrship_report;      cnt_t s_mbrship_report;
+-                cnt_t mbrship_reduction;   cnt_t s_mbrship_reduction;
+                 cnt_t nd_router_solicit;   cnt_t s_nd_router_solicit;
+                 cnt_t nd_router_advert;    cnt_t s_nd_router_advert;
+                 cnt_t nd_neighbor_solicit; cnt_t s_nd_neighbor_solicit;
+--- ./nstats-0.4.orig/src/nstats.c	2002-05-02 17:34:25.000000000 +0200
++++ ./nstats-0.4/src/nstats.c	2006-03-27 02:25:42.000000000 +0200
+@@ -528,12 +528,6 @@
+                 ICMP6.s_echo_request, ICMP6.bs);
+         print_line("Echo Reply:", ICMP6.echo_reply, ICMP6.cnt,
+                 ICMP6.s_echo_reply, ICMP6.bs);
+-        print_line("MbrShip Query:", ICMP6.mbrship_query, ICMP6.cnt,
+-                ICMP6.s_mbrship_query, ICMP6.bs);
+-        print_line("MbrShip Report:", ICMP6.mbrship_report, ICMP6.cnt,
+-                ICMP6.s_mbrship_report, ICMP6.bs);
+-        print_line("MbrShip Reduct.:", ICMP6.mbrship_reduction, ICMP6.cnt,
+-                ICMP6.s_mbrship_reduction, ICMP6.bs);
+         print_line("ND Rtr Solicit:", ICMP6.nd_router_solicit, ICMP6.cnt,
+                 ICMP6.s_nd_router_solicit, ICMP6.bs);
+         print_line("ND Rtr Advert:", ICMP6.nd_router_advert, ICMP6.cnt,
+@@ -553,8 +547,8 @@
+                 DESTU6.s_noroute, DESTU6.bs);
+         print_line("Admin:", DESTU6.admin, DESTU6.cnt,
+                 DESTU6.s_admin, DESTU6.bs);
+-        print_line("Not Neighbor:", DESTU6.notneighbor, DESTU6.cnt,
+-                DESTU6.s_notneighbor, DESTU6.bs);
++        print_line("Beyond Scope:", DESTU6.beyondscope, DESTU6.cnt,
++                DESTU6.s_beyondscope, DESTU6.bs);
+         print_line("Addr:", DESTU6.addr, DESTU6.cnt,
+                 DESTU6.s_addr, DESTU6.bs);
+         print_line("No Port:", DESTU6.noport, DESTU6.cnt,
diff --git a/net-analyzer/nstats/nstats-0.4-r1.ebuild b/net-analyzer/nstats/nstats-0.4-r1.ebuild
new file mode 100644
index 000000000000..1180be485b0f
--- /dev/null
+++ b/net-analyzer/nstats/nstats-0.4-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nstats/nstats-0.4-r1.ebuild,v 1.1 2006/03/27 00:41:43 jokey Exp $
+
+inherit eutils
+
+DESCRIPTION="Displays statistics about ethernet traffic including protocol breakdown"
+SRC_URI="http://trash.net/~reeler/nstats/files/${P}.tar.gz"
+HOMEPAGE="http://trash.net/~reeler/nstats/"
+
+SLOT="0"
+LICENSE="Artistic"
+KEYWORDS="~amd64 ~ppc sparc x86"
+IUSE=""
+
+DEPEND="net-libs/libpcap"
+
+src_unpack(){
+	unpack ${A}
+	#rename bmon to bmon.nstats to avoid conflict with net-analyzer/bmon
+	epatch ${FILESDIR}/${P}-makefile.patch
+	if has_version '>=sys-libs/glibc-2.4' ; then
+		epatch ${FILESDIR}/${P}-glibc24.patch
+	fi
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	dodoc BUGS COPYING doc/TODO doc/ChangeLog
+}