Old.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 9 insertions, 197 deletions

diff --git a/net-analyzer/iptraf-ng/ChangeLog b/net-analyzer/iptraf-ng/ChangeLog
index af4a4b0451e7..f9bf10fb1857 100644
--- a/net-analyzer/iptraf-ng/ChangeLog
+++ b/net-analyzer/iptraf-ng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/iptraf-ng
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf-ng/ChangeLog,v 1.77 2014/05/03 20:46:58 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf-ng/ChangeLog,v 1.78 2014/05/06 16:37:23 jer Exp $
+
+  06 May 2014; Jeroen Roovers <jer@gentoo.org> -iptraf-ng-1.1.3.1-r2.ebuild,
+  -files/iptraf-ng-1.1.3.1-kernel-v3.5-kill-off-token-ring-support.patch:
+  Old.
 
   03 May 2014; Mikle Kolyada <zlogene@gentoo.org> iptraf-ng-1.1.4-r1.ebuild:
   alpha stable wrt bug #498566
diff --git a/net-analyzer/iptraf-ng/Manifest b/net-analyzer/iptraf-ng/Manifest
index f7ef4a78a122..643d157b5b61 100644
--- a/net-analyzer/iptraf-ng/Manifest
+++ b/net-analyzer/iptraf-ng/Manifest
@@ -1,21 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX iptraf-ng-1.1.3.1-kernel-v3.5-kill-off-token-ring-support.patch 4139 SHA256 a36aaf8d110611ba8f9bd95a4ecdcb51fc90416b2f23fd708e130d4e87dec15d SHA512 16f0aaa181ba6bc4f1812783eb9bd110bed735ce0066a0db6384447f5c145f87ff0819fb3a6056af4e5cdb6eac2b0391a520d7ee15f7178118a505c245458b2c WHIRLPOOL 82fdc470203826395ee2a97bc97054b66adf1b8081ea4b3770dfcce189a4ca5ac3e6f4b7554d24577fe8a8114690eb96cc55d24b1705795c92b4ce17200fb0cb
 AUX iptraf-ng-1.1.4-tcplog_flowrate_msg.patch 330 SHA256 e9c9057612bca5b793ea12a271aabedba7185975edfd5571b9a2a664e31ed236 SHA512 4b0c318ad245a82bb44243e23322f3d71ef4af9b4c86c95911e4da1e8145418ac7b9ee76c7d33bdf05c1189ec782443382de773e228c76f179fab87d5e897ec6 WHIRLPOOL e93af74b32ab84ac2b3e8b23c63591819e3bfa5c4f21a39989fb93f84280015eebb5e76363e1cdb63ccd38db9be26ab12b52f951d93fa76c33cf2a163c7af924
-DIST iptraf-ng-1.1.3.1.tar.gz 589590 SHA256 687b5632290d9b4963842df36f3572d97e333656d1fb6c5f341ab7df651dc185 SHA512 eb477afa5d01a3c787a4db153669713fe13af866b76446191f5679098d96c2e72b3e21dbeceda202770022204d8c5217b52dc5c25e545129aef6de2de622c04a WHIRLPOOL aa812cbc4e9dc6b930e129a5cd10396d926545d6a78f8046a0de0190abebf4104732b858619fabd68fd1667f541962ae28663dd19a38edfe514f7bedd21a12aa
 DIST iptraf-ng-1.1.4.tar.gz 583306 SHA256 79140cf07c0cceb1b5723242847a73aa86f5e4f9dccfe8970fda6801d347eb09 SHA512 8cafb0000cec75eb4071156a9e9350ffe6de99cb6386e8f50d05337113872ee50082a30009d85faa02d83633a8e727039791332d600654321b95ca6cfc881774 WHIRLPOOL 442b6091c818f81a4db98999e7a6f0b9a1b58271c49c5758c70fd97c98c8b28c2f83e2824fb5ef434610f117ff071d5cc7335ea5cc01cbb384725018e9781d5d
-EBUILD iptraf-ng-1.1.3.1-r2.ebuild 1462 SHA256 3ff28136fc9ce64888a9667ad97a3309425f30fe6894251d493fa3ee99dad0ad SHA512 686386c52622553c62b94af907b1a1916e1d8966e630741fb3be6310a87e6eb137b042fdcf6a418d3a941fa516bac98422cb4a80d43c0e35ffef2fb1c782df0b WHIRLPOOL ed2f6c41ba0a87a4550e57ddfe759480b01048e7359ac328c3369128e2091b3400b5408fac05bcd512b5dc1dfc206f2b2f1130431d212e1592c3d8c954c81c5b
 EBUILD iptraf-ng-1.1.4-r1.ebuild 1451 SHA256 6bcc20343da63952803c99ffbe9ac2e4dc191b5ef39a6f75f7cdfc2e739d3502 SHA512 9bb891cca1d132e9f4303700e214eb1c7d13fc4ea41b1c5287daa78683ef73e81120bfa4b9830f8da0fef3bc15af207e9fb9f3a22c427367f58e61abaa3880d5 WHIRLPOOL 08832af4bd2a0894137c9ecc307375f3cc776447fd1696add0f8697ea50837882792b6efaf64ce1bf2dff9dfd45f8ee5cc4cdb0444e0551c4477eda065d0deaa
 EBUILD iptraf-ng-9999.ebuild 1317 SHA256 1c005d0105367e899833811a0cd255cf09399ef4a2122ff1bf126699d6499d4f SHA512 00517b167123e8b6d82ec25a8db88638971948d95ef241f21a629865f5a190ff8250328a5081b1f12b2446636336ffd76d62031ecbfbc7ac0b5c2e9aada44295 WHIRLPOOL 5cba60d70b45d2b94ca371c314615381a2c45e0b508a28b8908cf762267a2a8dcbde12600bddabd9499e8eaa1bee77b345837b0804a616ae9447de61b3c3fd88
-MISC ChangeLog 9782 SHA256 b951a44df3443b02efb51cf0ad7453c7aa0d68bacc7a49dd2e599f4883e7b02d SHA512 7f0c51be6b786ec8527519f1f5f8aa89436c23b191d1b674c952154ec7bd807ab3356e4c947e70110ff9acfa64df2bd28e2e4dc25f586131a7b73f9fd4e8286d WHIRLPOOL dec7aa347fcd14121ed6e16c58ca6378bc85670d84df94ec25bf6e96aada1a6a931af74ba06e2086e6ae1b3c7b9e0bed8963fd488bad19d173be02a9dce589d4
+MISC ChangeLog 9937 SHA256 0cba226fe4a8ef9349a0be54c18f84d05e726a8ba96dfdc636905e158b4aa9c4 SHA512 70e57b5cab63cd169a60c184baedf8a596f7bb20a7d0d3e863b23a8cc076bc3da205871c5970c69fe122cb1612c2e2d15c8c20e3fa3b182919842a9082bd8a8e WHIRLPOOL 31edce012052939cee3e7324909ea6385b55b48e73d4f1df867a7a3f9f9e54f43b2606054cb02a99bfda09c60135a93f22a768c3707e54a7eb2feee331cfb505
 MISC metadata.xml 259 SHA256 c1a418dd2aecd1f45aab6255aa581e7ad597001a2d3ada0928dc46820ebb93e7 SHA512 6ceb8a5bc92f0a423befc3485e83cc76d8ab8679fd3db75427ffd9a7c3c99374fb1586c96529339f133797b1fb6efad710c2ab1b2fbd2cd6dd930fcbff569a1a WHIRLPOOL 06d118cb1f3bcbbc2685f71b6ef4fcf0ea7bb8d6a6e5408f0f6b00fd0e82519abffe989e234faeb5789f7a956d129f7c16759f04e41e21062fa6da69cd5f4c02
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iJwEAQEIAAYFAlNlVxAACgkQG9wOWsQutdYsTAQA0BJrdfMO378jaF5HGkXgK8V9
-3lfZItvD3H1oahNGbZw1L75aUBDt08Q3ljFyL1uldtDnbbL2/bmN7HlMi6wEPDZm
-gwSTqpfTBZ7mCLFzxT8c4KbQkiO8G6VhvuLnGfTlLGEKvlZDXSob2UePo7p4D4DC
-NKa5Uvm1GHj/pCpSJDU=
-=7I9/
+iEYEAREIAAYFAlNpD8QACgkQVWmRsqeSphOvqwCfd1JhidMApA2DCnn7SY309pmd
+dt4AmgImNB0RvsDH0L8bTXCCm9jR/Bss
+=x+U6
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.3.1-kernel-v3.5-kill-off-token-ring-support.patch b/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.3.1-kernel-v3.5-kill-off-token-ring-support.patch
deleted file mode 100644
index e5c04cd891f1..000000000000
--- a/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.3.1-kernel-v3.5-kill-off-token-ring-support.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From 72512af1a3f1d55fff73cdfe7b63d9cfe8cc37ab Mon Sep 17 00:00:00 2001
-Message-Id: <72512af1a3f1d55fff73cdfe7b63d9cfe8cc37ab.1337783673.git.npajkovs@redhat.com>
-From: Nikola Pajkovsky <npajkovs@redhat.com>
-Date: Wed, 23 May 2012 16:32:27 +0200
-Subject: [PATCH] token-ring: kernel v3.5 kill off token-ring support
-
-Signed-off-by: Nikola Pajkovsky <npajkovs@redhat.com>
----
- src/hostmon.c          |   10 ----------
- src/iptraf-ng-compat.h |    1 -
- src/othptab.c          |    6 ------
- src/packet.c           |   27 ---------------------------
- src/tcptable.c         |    4 ----
- 5 files changed, 48 deletions(-)
-
-diff --git a/src/hostmon.c b/src/hostmon.c
-index 40a2b95..72b91f8 100644
---- a/src/hostmon.c
-+++ b/src/hostmon.c
-@@ -1004,16 +1004,6 @@ void hostmon(const struct OPTIONS *options, time_t facilitytime, char *ifptr,
- 				       FDDI_K_ALEN);
- 				list = flist;
- 				break; }
--			case ARPHRD_IEEE802:
--			case ARPHRD_IEEE802_TR: {
--				struct trh_hdr *hdr_trh =
--					(struct trh_hdr *)pkt.pkt_buf;
--				memcpy(scratch_saddr, hdr_trh->saddr,
--				       TR_ALEN);
--				memcpy(scratch_daddr, hdr_trh->daddr,
--				       TR_ALEN);
--				list = flist;
--				break; }
- 			default:
- 				/* unknown link protocol */
- 				continue;
-diff --git a/src/iptraf-ng-compat.h b/src/iptraf-ng-compat.h
-index d5aee4a..2d9da96 100644
---- a/src/iptraf-ng-compat.h
-+++ b/src/iptraf-ng-compat.h
-@@ -39,7 +39,6 @@
- #include <linux/if_ether.h>
- #include <linux/if_packet.h>
- #include <linux/if_fddi.h>
--#include <linux/if_tr.h>
- #include <linux/types.h>
- #include <linux/isdn.h>
- 
-diff --git a/src/othptab.c b/src/othptab.c
-index d12cdfd..1181eb1 100644
---- a/src/othptab.c
-+++ b/src/othptab.c
-@@ -193,12 +193,6 @@ struct othptabent *add_othp_entry(struct othptable *table, struct pkt_hdr *pkt,
- 					      saddr), new_entry->smacaddr);
- 			convmacaddr((char *) (((struct fddihdr *) packet)->
- 					      daddr), new_entry->dmacaddr);
--		} else if ((pkt->pkt_hatype == ARPHRD_IEEE802)
--			   || (pkt->pkt_hatype == ARPHRD_IEEE802_TR)) {
--			convmacaddr((char *) (((struct trh_hdr *) packet)->
--					      saddr), new_entry->smacaddr);
--			convmacaddr((char *) (((struct trh_hdr *) packet)->
--					      daddr), new_entry->dmacaddr);
- 		}
- 	}
- 
-diff --git a/src/packet.c b/src/packet.c
-index a43a27a..f3e4304 100644
---- a/src/packet.c
-+++ b/src/packet.c
-@@ -51,24 +51,6 @@ static int in_cksum(u_short * addr, int len)
- 	return (u_short) (~sum);
- }
- 
--static unsigned int get_tr_ip_offset(char *pkt)
--{
--	struct trh_hdr *trh;
--	unsigned int riflen = 0;
--
--	trh = (struct trh_hdr *) pkt;
--
--	/*
--	 * Check if this packet has TR routing information and get
--	 * its length.
--	 */
--	if (trh->saddr[0] & TR_RII)
--		riflen = (ntohs(trh->rcf) & TR_RCF_LEN_MASK) >> 8;
--
--	return sizeof(struct trh_hdr) - TR_MAXRIFLEN + riflen +
--	    sizeof(struct trllc);
--}
--
- static int packet_adjust(struct pkt_hdr *pkt)
- {
- 	int retval = 0;
-@@ -109,15 +91,6 @@ static int packet_adjust(struct pkt_hdr *pkt)
- 		pkt->pkt_payload += sizeof(struct fddihdr);
- 		pkt->pkt_len -= sizeof(struct fddihdr);
- 		break;
--	case ARPHRD_IEEE802_TR:
--	case ARPHRD_IEEE802:
--		pkt->pkt_payload = pkt->pkt_buf;
--		/* Token Ring patch supplied by Tomas Dvorak */
--		/* Get the start of the IP packet from the Token Ring frame. */
--		unsigned int dataoffset = get_tr_ip_offset(pkt->pkt_payload);
--		pkt->pkt_payload += dataoffset;
--		pkt->pkt_len -= dataoffset;
--		break;
- 	default:
- 		/* return a NULL packet to signal an unrecognized link */
- 		/* protocol to the caller.  Hopefully, this switch statement */
-diff --git a/src/tcptable.c b/src/tcptable.c
-index 56c4780..b0e5ccc 100644
---- a/src/tcptable.c
-+++ b/src/tcptable.c
-@@ -620,10 +620,6 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry,
- 		} else if (linkproto == ARPHRD_FDDI) {
- 			convmacaddr((char *) (((struct fddihdr *) packet)->
- 					      saddr), newmacaddr);
--		} else if ((linkproto == ARPHRD_IEEE802)
--			   || (linkproto == ARPHRD_IEEE802_TR)) {
--			convmacaddr((char *) (((struct trh_hdr *) packet)->
--					      saddr), newmacaddr);
- 		}
- 
- 		if (tableentry->smacaddr[0] != '\0') {
--- 
-1.7.10
-
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.1.3.1-r2.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.3.1-r2.ebuild
deleted file mode 100644
index 3192dee3959b..000000000000
--- a/net-analyzer/iptraf-ng/iptraf-ng-1.1.3.1-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf-ng/iptraf-ng-1.1.3.1-r2.ebuild,v 1.14 2013/03/01 12:41:45 ago Exp $
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A console-based network monitoring utility"
-HOMEPAGE="http://fedorahosted.org/iptraf-ng/"
-SRC_URI="http://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 doc? ( FDL-1.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="doc"
-
-RESTRICT="test"
-
-RDEPEND=">=sys-libs/ncurses-5.7-r7"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	!net-analyzer/iptraf"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-kernel-v3.5-kill-off-token-ring-support.patch
-
-	sed -i \
-		-e '/^CC =/d' \
-		-e '/^CFLAGS/s:= -g -O2:+= :' \
-		-e '/^LDFLAGS =/d' \
-		-e 's|$(QUIET_[[:alpha:]]*)||g' \
-		Makefile || die
-	sed -i \
-		-e 's|IPTRAF|&-NG|g' \
-		-e 's|IPTraf|&-NG|g' \
-		-e 's|iptraf|&-ng|g' \
-		-e 's|rvnamed|&-ng|g' \
-		-e 's|RVNAMED|&-NG|g' \
-		src/*.8 || die
-}
-
-# configure does not do very much we do not already control
-src_configure() { :; }
-
-src_compile() {
-	tc-export CC
-	CFLAGS+=' -DLOCKDIR=\"/run/lock/iptraf-ng\"'
-	default
-}
-
-src_install() {
-	dosbin {iptraf,rvnamed}-ng
-
-	doman src/*.8
-	dodoc AUTHORS CHANGES FAQ README* RELEASE-NOTES
-	use doc && dohtml -a gif,html,png -r Documentation/*
-
-	keepdir /var/{lib,log}/iptraf-ng #376157
-}