Merge pull request #42 from philips/add-network-diag-tools

bump iputils
This commit is contained in:
Brandon Philips 2013-09-04 12:49:30 -07:00
commit d9f7f2da8f
10 changed files with 44 additions and 273 deletions

View File

@ -1,6 +1,21 @@
# ChangeLog for net-misc/iputils
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.118 2013/01/31 23:10:23 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.123 2013/06/09 23:01:13 vapier Exp $
09 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
Add upstream CPE tag (security info) from ChromiumOS.
08 Feb 2013; Agostino Sarubbo <ago@gentoo.org> iputils-20121221.ebuild:
Stable for alpha, wrt bug #408183
08 Feb 2013; Agostino Sarubbo <ago@gentoo.org> iputils-20121221.ebuild:
Stable for s390, wrt bug #408183
08 Feb 2013; Agostino Sarubbo <ago@gentoo.org> iputils-20121221.ebuild:
Stable for sh, wrt bug #408183
06 Feb 2013; Agostino Sarubbo <ago@gentoo.org> iputils-20121221.ebuild:
Stable for sparc, wrt bug #408183
31 Jan 2013; Agostino Sarubbo <ago@gentoo.org> iputils-20121221.ebuild:
Stable for ppc, wrt bug #408183

View File

@ -1,3 +1,6 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
AUX 021109-uclibc-no-ether_ntohost.patch 635 SHA256 cf8135fd380918890a1da8de438d5283111f1e9ea0754b4f5c78bb703fcf617b SHA512 29ccbbf19bd40e9c929af403227f49586a4cb79d7ef948710b34b0813d116017530ef1bf0082b093b4179edff1daa275906cfb9a565f61dd5bed10f24b66fd38 WHIRLPOOL e5390a41b0764d78cda651dd6fff2ebd4f206dc6f5b34da370c19cee7d44f373035fc1efa2bf90924b5a06ca48f344f80a2c902abe04eb588d01e0a9d59bf79d
AUX iputils-20070202-idn.patch 3303 SHA256 449e356a14aee6ad27ac4581055d489da764403447df8f2a50ecb1c4ac71e533 SHA512 42037984cf29e1166cca31fd4325e3deed5739a5aa9ba3632a201f06bb5ae76b291a10350f6cff037cfa158c5573a5f6c9bb420c21041779669497760d5d232d WHIRLPOOL 3183deb53d6773c884b46efc86ddf231b934b91d34742158b17d4901f4b8aab292ac9e18414816d611f922ecf2d252d76c7b2f49a0f7489ff031f8b9022d99c9
AUX iputils-20071127-infiniband.patch 7748 SHA256 98336a7656f2b0e1f080223395658ac57f545ef47644d68e989664a184c769d5 SHA512 9b74062ff74551b4de1cedcf4854e77759e3936b54e2db5fd9cdbbc8028a55495a2a2c10fc0514fc374343a644bf0c9706076480703e45a41c9f552846d93a51 WHIRLPOOL 6a0cd3df4080c7937c2f6de8fa3ea8eb8da5e5337d1c28ae706e81678373f4064c74f4da46dca0a3cdf461fce92948b58ea2629d2573b4098c712bfdeedbc08e
@ -21,7 +24,24 @@ DIST iputils-s20121221-manpages.tar.bz2 23778 SHA256 6fc7ed7d281b7a2ee00e4f75e54
DIST iputils-s20121221.tar.bz2 155344 SHA256 450f549fc5b620c23c5929aa6d54b7ddfc7ee1cb1e8efdc5e8bb21d8d0c5319f SHA512 693d240becd766c345c3af2053fc0699b9358e54d667d40738c21d731b70e779112d81476a220d8300ca54250120385414a13610d445996f95a90571047389f4 WHIRLPOOL 64529180eb4b8e2f7a60c18df7cac49e10a4b7702514252d418b16dcdc10a85ccb0a7f8beb51274cc9d708be2026c4c136e720986795fd39d314e4f9d5590ec9
EBUILD iputils-20101006-r2.ebuild 2887 SHA256 1b9c683f1532748b27ef1d14c462ee254234c755629135371815c7930ebb395e SHA512 6a2accea1c49891e3bcb483dd16ea6d0801c6eb59babdbb1ff488f40c940b76d2a56cefb46208836c67f1b18de4d090a72e36e37893cc1bccd3f68da75afc356 WHIRLPOOL c8301bed7a59a1422a75a4afa6723e2535e2ce522f4c2edc1cd82b1005dfc678647fc00f7a411d8a3faa0fa170b212b8cd49dbc8ddb7fed4b46f64084d73d994
EBUILD iputils-20121221-r1.ebuild 2889 SHA256 520da2bc12db2296d988d9df5774036a21e57dac66c4607c6b5581081d00e73f SHA512 b177d82fcc2f52e836ad09f98f588241c5a14a5a8cb0a9ddda6e2c1f90730bc26faa7ff78c56acd3a2266dfa728aa9d215af0c35e8cef9acb9e4b8c2f9217417 WHIRLPOOL 637dc3dd10ce5bc0c5375071b2725ea2bd784c369099c15b0e586e04f96b0159258430c5ace56ea90cd3adf4ae635ce0b290750a34168e89336f384dabcb958b
EBUILD iputils-20121221.ebuild 2846 SHA256 f7b2b671fffb83bd1fca35c600e1c32fa6817c4bbabc47941ced278f88a5e2a4 SHA512 3cc3006b3aa8664e92b3bfcc969faa302b7fe951846368e8c7713bdbc5e73fbb948fbd97b961ba2f46eb67011595db6bd424b81c0770f2b358e3d18f58af4b22 WHIRLPOOL 6df9d78f9dc8f183e6322f6dff23c02fbe41b5b89867ee9fb49d434528571f61308a6e2ebc3d172992767ccfe12b68268f9c59f03a27d02ae884cc12b107138c
EBUILD iputils-20121221.ebuild 2842 SHA256 65fa7a954b98dfd3e87e9403d3c3fbb1494fb04ea57144415fe246d78e7277be SHA512 278d77f3bc47e913228052dac430e475680c7429c83ea46f944f9c71cb2a7b568d628eb56e8a538ac32d37db0260a69da6d7aa6ce9ff4c3bde150f53a518510a WHIRLPOOL ffb59c1a117e3cca54463589b66ba7bafc84cf1f76a021c1d3163f3723dbaea88296b431bbba368bc08c4845d250822661e99fd13527d5dfd445dcddf80dff62
EBUILD iputils-99999999.ebuild 2831 SHA256 a17029468a76c652a88da3b34f6ea6de7f359dae6a7eb2b6bbe76733739e10fe SHA512 f6888eab731f7ff50ca4ec28f16db00a60ef4f2b003d42d42bfc11d2b1fc6fae7fa80bebacd89ebe0e303f4a4871297d902f84534de8c64b406d94a1b3a45188 WHIRLPOOL 04602c5675494881f3b6bd78b08f13c82d3ca4e7f37c97b6fd32a0a9061b3a237fb3a6b9862e43ce0b1791b6fa4c122011efcec290bcc0d06358306a01033b85
MISC ChangeLog 17943 SHA256 351bc09cab1e3978a4eb553ef1a379466f6a16b67afb87423627aeccd7655687 SHA512 d858fbd201b4a8d3668dc8e7b74aa11b385001176b130a0f4ea8f841a43263a5efbba8172a6a0a38f237fafd415fafd9d5a1e1d5f6ca6b188fdc90a7a8005d6b WHIRLPOOL c4c31087e37ac1928586b083c342133ea6f7d2038f2761f8dbecb2cc52640124738ed1fefe65c2c5bfbde9b0994d4244bcf5dbf2b6900751d3f562a30244fed8
MISC metadata.xml 299 SHA256 d028d4ba25f3ed29afbbf77abd924a617098bff71e6a0c37b7d6c0a24cd65a78 SHA512 25c1c360ecadd8f3cb4476635d94de097ef2d7c8a8e5b8305c1626246fc89e60b6cf7661002d85b37cd6f01594020e568f835d657e2318e417cd3859971d83f7 WHIRLPOOL adda1e0b6cd078dbf5740f575ff8d4a4ab108b3f06e192d6d948bf03a5d249013fb5d52d3069d8024e3c40b23d02f31ca219a2e91c1e28312324dd2f68eb7f11
MISC ChangeLog 18507 SHA256 2abedecccf1c2f83c2718e3ca6927d4b943ad204827e75ef3ec07fca640b0109 SHA512 a03eac9f891b92757e3948e0a49e007b5b91d37f54810eb9d96fe2145f3751403b5dac0890b7eab5c97d827d6917d3a4e3b8bb5db1dc0b3b34b6b44818ce5acd WHIRLPOOL 933a85b4a7a5c579e9b3b745d5cdf81706eae133b628ef45876091d2733a5a06e04361b0ce70f0d1ae459b86778a34f2fcef03bed1054c7df8143b593fdc0f9c
MISC metadata.xml 386 SHA256 36462bcda28f18d127af12e2c6fdf58a813f3a5018a9151695892c1b706da52d SHA512 d7529383e575fbdbae4c96123530672192198cf1c4fc3a22097c42ddb3d179b8c99c67e274fbade85c68fc742d5792fb5286f40993f1099dc4694b1cf9942224 WHIRLPOOL 24417ef5492727316830ab0f208138c8ba41ae3e51b46e398297b1ed823f7d801e1cb4bb2ca6d87035f37a4072919073bd99dd8677cb67f3263258cb72184764
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iQIcBAEBCAAGBQJRtQk/AAoJELEHsLL7fEFWN3oQAI9jJr06b42bp5FWJ/y/T0/i
XRzI9/PophNo1JvUrImGZ29QpDCcjQCrm4Xla/Aw8Jbf/6xdvIkDXiy6oBK8ebKc
6vDpOU0rSBJ1TO7Graou1rjd/yKihVHD/VcE8plirqnguOkbVTvEH1rUesyP3+rE
f2qQI3ZPXN3D2UvYnx49q29mqOGGBn6ddPy6Zy1SNg2Fk3LxfjXZ8gcpNksE/9pZ
DvQn9CaQiii+LsKotsWrkgf87sMjrCJKV+AUuci2V7unlr2Iks717Og1s14tNu4V
sxC+fJWhnUROblEok0wv4kMCKYNJZEVSeokLf2xN6UPE8VsEC8pCoLKp8tNV6xGE
7KS3FIo/P+l+qGZdFFWEBa4oDNLhUK6Wmta98Syg2CaIfyoCNLyU8KiOdQMDsFmw
iTPGnBka3ffm8HH1vHoIfeG4pqJJoB++A1UCHahllZ7S84l8zR5LypWonSmy4l5U
aXCWigrL/2+vsmuEL9BSgHZN23taHKhMlIDzGrN1H6GS9KHX0id+LmHalU6LxfDi
PDfxZXmSVkGGNlzyy/CmpwD/8m1hMH+fHGHgY1eBqZyac8mN1Z/cBVBC6/Lk1ofz
gZ/4hd/VZiIPulWy2c4mr0vhDziahKUND6eyFsXX2V4YIZIjV2r2Cc3DF5JVYOXM
7Qxe1OyEBRI2W/AkjOeD
=RyE/
-----END PGP SIGNATURE-----

View File

@ -1,10 +0,0 @@
--- rdisc.c
+++ rdisc.c
@@ -34,6 +34,7 @@
#include <sys/time.h>
/* Do not use "improved" glibc version! */
#include <linux/limits.h>
+#include <linux/types.h>
#include <sys/param.h>
#include <sys/socket.h>

View File

@ -1,35 +0,0 @@
--- Makefile
+++ Makefile
@@ -1,20 +1,17 @@
# Path to parent kernel include files directory
LIBC_INCLUDE=/usr/include
-DEFINES=
-
#options if you have a bind>=4.9.4 libresolv (or, maybe, glibc)
LDLIBS=-lresolv
-ADDLIB=
#options if you compile with libc5, and without a bind>=4.9.4 libresolv
# NOT AVAILABLE. Please, use libresolv.
-CC=gcc
# What a pity, all new gccs are buggy and -Werror does not work. Sigh.
#CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g -Werror
-CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
-CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES)
+CFLAGS ?= -O2 -g
+CFLAGS += -Wstrict-prototypes -Wall
+CPPFLAGS += -D_GNU_SOURCE
IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
IPV6_TARGETS=tracepath6 traceroute6 ping6
@@ -35,7 +32,7 @@
rdisc_srv: rdisc_srv.o
rdisc_srv.o: rdisc.c
- $(CC) $(CFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c
check-kernel:

View File

@ -1,16 +0,0 @@
the OPEN_MAX define has been removed in newer kernel headers so use the
proper method of getting the value dynamically
http://bugs.gentoo.org/195861
--- a/rdisc.c
+++ b/rdisc.c
@@ -247,7 +247,7 @@ void do_fork(void)
if ((pid=fork()) != 0)
exit(0);
- for (t = 0; t < OPEN_MAX; t++)
+ for (t = 0; t < sysconf(_SC_OPEN_MAX); t++)
if (t != s)
close(t);

View File

@ -1,134 +0,0 @@
iputils has a lot of ugly goto's that break when using
large gcc inline-limits.
Fixes by Robert Moss and Dave Stahl
http://bugs.gentoo.org/49241
http://bugs.gentoo.org/80969
--- iputils/tracepath.c
+++ iputils/tracepath.c
@@ -76,7 +76,7 @@
int progress = -1;
int broken_router;
-restart:
+ while (1) {
memset(&rcvbuf, -1, sizeof(rcvbuf));
iov.iov_base = &rcvbuf;
iov.iov_len = sizeof(rcvbuf);
@@ -93,7 +93,7 @@
if (res < 0) {
if (errno == EAGAIN)
return progress;
- goto restart;
+ continue;
}
progress = mtu;
@@ -216,7 +216,7 @@
perror("NET ERROR");
return 0;
}
- goto restart;
+ }
}
int probe_ttl(int fd, int ttl)
@@ -227,7 +227,6 @@
memset(sndbuf,0,mtu);
-restart:
for (i=0; i<10; i++) {
int res;
@@ -243,7 +242,8 @@
if (res==0)
return 0;
if (res > 0)
- goto restart;
+ i = 0;
+ continue;
}
hisptr = (hisptr + 1)&63;
--- iputils/tracepath6.c
+++ iputils/tracepath6.c
@@ -66,7 +66,7 @@
int progress = -1;
int broken_router;
-restart:
+ while (1) {
memset(&rcvbuf, -1, sizeof(rcvbuf));
iov.iov_base = &rcvbuf;
iov.iov_len = sizeof(rcvbuf);
@@ -83,7 +83,7 @@
if (res < 0) {
if (errno == EAGAIN)
return progress;
- goto restart;
+ continue;
}
progress = 2;
@@ -222,34 +222,29 @@
perror("NET ERROR");
return 0;
}
- goto restart;
+ }
}
int probe_ttl(int fd, int ttl)
{
- int i;
+ int i=0, res;
char sndbuf[mtu];
struct probehdr *hdr = (struct probehdr*)sndbuf;
-restart:
-
- for (i=0; i<10; i++) {
- int res;
-
- hdr->ttl = ttl;
- gettimeofday(&hdr->tv, NULL);
- if (send(fd, sndbuf, mtu-overhead, 0) > 0)
- break;
- res = recverr(fd, ttl);
- if (res==0)
- return 0;
- if (res > 0)
- goto restart;
- }
-
- if (i<10) {
- int res;
-
+ while (i<10) {
+ for (i=0; i<10; i++) {
+ hdr->ttl = ttl;
+ gettimeofday(&hdr->tv, NULL);
+ if (send(fd, sndbuf, mtu-overhead, 0) > 0)
+ break;
+ res = recverr(fd, ttl);
+ if (res==0)
+ return 0;
+ if (res > 0) {
+ i = 0;
+ continue;
+ }
+ }
data_wait(fd);
if (recv(fd, sndbuf, sizeof(sndbuf), MSG_DONTWAIT) > 0) {
printf("%2d?: reply received 8)\n", ttl);
@@ -257,7 +252,7 @@
}
res = recverr(fd, ttl);
if (res == 1)
- goto restart;
+ continue;
return res;
}

View File

@ -1,50 +0,0 @@
http://bugs.gentoo.org/337049
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=585591
From: Jesper Dangaard Brouer <hawk@comx.dk>
Subject: [PATCH] iputils: arping fails to set correct broadcast address
From: Paul Martin <pm@debian.org>
There seems to have been introduced a bug in iputils release s20100418.
This patch is based upon git://www.linux-ipv6.org/gitroot/iputils.git
(git commit fe342ca3148)
The regression is caused by commit 56018bf1b3
arping: Support link-layer type with larger link-layer address.
As reported by: Paul Martin <pm@debian.org> in Debian bugreport #585591.
There's a logic error in the function that parses the interface's
broadcast address, causing it not to fill the broadcast address array
correctly.
Please apply.
Reported-by: Paul Martin <pm@debian.org>
Tested-by: Jesper Dangaard Brouer <hawk@comx.dk>
Signed-off-by: Jesper Dangaard Brouer <hawk@comx.dk>
---
arping.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arping.c b/arping.c
index 9bd6927..2613a12 100644
--- a/arping.c
+++ b/arping.c
@@ -336,7 +336,7 @@ void set_device_broadcast(char *device, unsigned char *ba, size_t balen)
}
for (p = ba, ch = 0; p < ba + balen; p++, ch += 3)
- *p++ = strtoul(brdcast->value + ch * 3, NULL, 16);
+ *p = strtoul(brdcast->value + ch, NULL, 16);
return;
}

View File

@ -1,22 +0,0 @@
https://bugs.gentoo.org/332527
--- iputils-s20100418/ping.c
+++ iputils-s20100418/ping.c
@@ -1083,7 +1083,7 @@ void pr_options(unsigned char * cp, int
i = j;
i -= IPOPT_MINOFF;
if (i <= 0)
- continue;
+ break;
if (i == old_rrlen
&& !strncmp((char *)cp, old_rr, i)
&& !(options & F_FLOOD)) {
@@ -1120,7 +1120,7 @@ void pr_options(unsigned char * cp, int
i = j;
i -= 5;
if (i <= 0)
- continue;
+ break;
flags = *++cp;
printf("\nTS: ");
cp++;

View File

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20121221.ebuild,v 1.10 2013/01/31 23:10:23 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20121221.ebuild,v 1.14 2013/02/08 16:47:03 ago Exp $
# For released versions, we precompile the man/html pages and store
# them in a tarball on our mirrors. This avoids ugly issues while
@ -16,7 +16,7 @@ if [[ ${PV} == "99999999" ]] ; then
else
SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2
mirror://gentoo/iputils-s${PV}-manpages.tar.bz2"
KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
fi
DESCRIPTION="Network monitoring tools including ping and ping6"

View File

@ -5,4 +5,7 @@
<use>
<flag name="SECURITY_HAZARD">Allow non-root users to flood (ping -f). This is generally a very bad idea.</flag>
</use>
<upstream>
<remote-id type="cpe">cpe:/a:skbuff:iputils</remote-id>
</upstream>
</pkgmetadata>