mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-30 18:12:08 +02:00
chore(net-misc/iputils): import from portage
Change-Id: I3cc52cd2e8802b35cd27faa1b93f59e757b39174
This commit is contained in:
Brandon Philips
parent
68e4cf2f5b
commit
b270bbdd56
483
sdk_container/src/third_party/portage-stable/net-misc/iputils/ChangeLog
vendored
Normal file
483
sdk_container/src/third_party/portage-stable/net-misc/iputils/ChangeLog
vendored
Normal file
@ -0,0 +1,483 @@
|
|||||||
|
# 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 $
|
||||||
|
|
||||||
|
31 Jan 2013; Agostino Sarubbo <ago@gentoo.org> iputils-20121221.ebuild:
|
||||||
|
Stable for ppc, wrt bug #408183
|
||||||
|
|
||||||
|
31 Jan 2013; Agostino Sarubbo <ago@gentoo.org> iputils-20121221.ebuild:
|
||||||
|
Stable for ppc64, wrt bug #408183
|
||||||
|
|
||||||
|
30 Jan 2013; Agostino Sarubbo <ago@gentoo.org> iputils-20121221.ebuild:
|
||||||
|
Stable for x86, wrt bug #408183
|
||||||
|
|
||||||
|
29 Jan 2013; Agostino Sarubbo <ago@gentoo.org> iputils-20121221.ebuild:
|
||||||
|
Stable for ia64, wrt bug #408183
|
||||||
|
|
||||||
|
28 Jan 2013; Mike Frysinger <vapier@gentoo.org> iputils-20121221-r1.ebuild,
|
||||||
|
iputils-20121221.ebuild, iputils-99999999.ebuild:
|
||||||
|
Use slot 0 for openssl as pointed out by Zac Medico.
|
||||||
|
|
||||||
|
28 Jan 2013; Jeroen Roovers <jer@gentoo.org> iputils-20121221.ebuild:
|
||||||
|
Stable for HPPA (bug #408183).
|
||||||
|
|
||||||
|
28 Jan 2013; Mike Frysinger <vapier@gentoo.org> iputils-20121221.ebuild,
|
||||||
|
iputils-20121221-r1.ebuild, iputils-99999999.ebuild:
|
||||||
|
Have USE=static depend on USE=static-libs in all of its lib packages #454410
|
||||||
|
by Sergey Popov. Also put ssl/gnutls behind USE=ipv6 since that code is only
|
||||||
|
used in ping6.
|
||||||
|
|
||||||
|
28 Jan 2013; Sergey Popov <pinkbyte@gentoo.org> iputils-20121221.ebuild:
|
||||||
|
Stable on arm, wrt bug #408183
|
||||||
|
|
||||||
|
28 Jan 2013; Sergey Popov <pinkbyte@gentoo.org> iputils-20121221.ebuild:
|
||||||
|
Stable on amd64, wrt bug #408183
|
||||||
|
|
||||||
|
*iputils-20121221-r1 (27 Jan 2013)
|
||||||
|
|
||||||
|
27 Jan 2013; Mike Frysinger <vapier@gentoo.org> +iputils-20121221-r1.ebuild,
|
||||||
|
iputils-99999999.ebuild:
|
||||||
|
Move traceroute6 to the traceroute package. Move arping/clockdiff to bin.
|
||||||
|
Use new file capabilities to allow people to execute
|
||||||
|
arping/clockdiff/ping/ping6.
|
||||||
|
|
||||||
|
26 Jan 2013; Mike Frysinger <vapier@gentoo.org>
|
||||||
|
files/iputils-20121221-makefile.patch:
|
||||||
|
Fix CC/CFLAGS handling #454136 by Alphat-PC.
|
||||||
|
|
||||||
|
*iputils-20121221 (25 Jan 2013)
|
||||||
|
|
||||||
|
25 Jan 2013; Mike Frysinger <vapier@gentoo.org>
|
||||||
|
+files/iputils-20121221-crypto-build.patch,
|
||||||
|
+files/iputils-20121221-makefile.patch, +files/iputils-20121221-openssl.patch,
|
||||||
|
+files/iputils-20121221-owl-pingsock.diff,
|
||||||
|
+files/iputils-20121221-printf-size.patch, +iputils-20121221.ebuild,
|
||||||
|
iputils-20101006-r2.ebuild, iputils-99999999.ebuild:
|
||||||
|
Version bump #453806 by Agostino Sarubbo.
|
||||||
|
|
||||||
|
20 Apr 2012; Samuli Suominen <ssuominen@gentoo.org>
|
||||||
|
-files/iputils-20070202-makefile.patch, -iputils-20100418-r1.ebuild,
|
||||||
|
-files/iputils-20100418-arping-broadcast.patch,
|
||||||
|
-files/iputils-20100418-ping-CVE-2010-2529.patch, -iputils-20101006.ebuild,
|
||||||
|
-iputils-20101006-r1.ebuild,
|
||||||
|
-files/iputils-20101006-tracepath-error-typo.patch:
|
||||||
|
old
|
||||||
|
|
||||||
|
13 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org>
|
||||||
|
iputils-20101006-r2.ebuild:
|
||||||
|
ppc64 stable wrt #394191
|
||||||
|
|
||||||
|
04 Jan 2012; Brent Baude <ranger@gentoo.org> iputils-20101006-r2.ebuild:
|
||||||
|
Marking iputils-20101006-r2 ppc for bug 394191
|
||||||
|
|
||||||
|
17 Dec 2011; Raúl Porcel <armin76@gentoo.org> iputils-20101006-r2.ebuild:
|
||||||
|
alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #394191
|
||||||
|
|
||||||
|
14 Dec 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
|
||||||
|
iputils-20101006-r2.ebuild:
|
||||||
|
x86 stable wrt bug #394191
|
||||||
|
|
||||||
|
12 Dec 2011; Agostino Sarubbo <ago@gentoo.org> iputils-20101006-r2.ebuild:
|
||||||
|
Stable for AMD64, wrt bug #394191
|
||||||
|
|
||||||
|
12 Dec 2011; Jeroen Roovers <jer@gentoo.org> iputils-20101006-r2.ebuild:
|
||||||
|
Stable for HPPA (bug #394191).
|
||||||
|
|
||||||
|
*iputils-20101006-r2 (09 Nov 2011)
|
||||||
|
|
||||||
|
09 Nov 2011; Mike Frysinger <vapier@gentoo.org> +iputils-20101006-r2.ebuild,
|
||||||
|
+files/iputils-20101006-owl-pingsock.diff, iputils-99999999.ebuild:
|
||||||
|
Add patch from OWL for non-root/set*id/cap ping support.
|
||||||
|
|
||||||
|
21 Sep 2011; Michał Górny <mgorny@gentoo.org> iputils-99999999.ebuild:
|
||||||
|
Migrate to git-2.
|
||||||
|
|
||||||
|
*iputils-20101006-r1 (07 Aug 2011)
|
||||||
|
|
||||||
|
07 Aug 2011; Samuli Suominen <ssuominen@gentoo.org>
|
||||||
|
+files/iputils-20071127-infiniband.patch, +iputils-20101006-r1.ebuild,
|
||||||
|
iputils-99999999.ebuild:
|
||||||
|
Import Fedora patch to remove sysfsutils depend from arping.c wrt #377687 by
|
||||||
|
Anthony Basile
|
||||||
|
|
||||||
|
*iputils-20101006 (19 Feb 2011)
|
||||||
|
|
||||||
|
19 Feb 2011; Mike Frysinger <vapier@gentoo.org> +iputils-20101006.ebuild,
|
||||||
|
+files/iputils-20101006-tracepath-error-typo.patch, iputils-99999999.ebuild:
|
||||||
|
Version bump, and unify git/non-git ebuilds in the process.
|
||||||
|
|
||||||
|
07 Jan 2011; Brent Baude <ranger@gentoo.org> iputils-20100418-r1.ebuild:
|
||||||
|
stable ppc, bug 342277
|
||||||
|
|
||||||
|
06 Jan 2011; Raúl Porcel <armin76@gentoo.org> iputils-20100418-r1.ebuild:
|
||||||
|
ia64/m68k/s390/sh/sparc stable wrt #342277
|
||||||
|
|
||||||
|
27 Dec 2010; Brent Baude <ranger@gentoo.org> iputils-20100418-r1.ebuild:
|
||||||
|
stable ppc64, bug 342277
|
||||||
|
|
||||||
|
27 Dec 2010; Jeroen Roovers <jer@gentoo.org> iputils-20100418-r1.ebuild:
|
||||||
|
Stable for HPPA (bug #342277).
|
||||||
|
|
||||||
|
25 Dec 2010; Markus Meier <maekke@gentoo.org> iputils-20100418-r1.ebuild:
|
||||||
|
arm stable, bug #342277
|
||||||
|
|
||||||
|
22 Dec 2010; Tobias Klausmann <klausman@gentoo.org>
|
||||||
|
iputils-20100418-r1.ebuild:
|
||||||
|
Stable on alpha, bug #342277
|
||||||
|
|
||||||
|
22 Dec 2010; Markos Chandras <hwoarang@gentoo.org>
|
||||||
|
iputils-20100418-r1.ebuild:
|
||||||
|
Stable on amd64 wrt bug #342277
|
||||||
|
|
||||||
|
16 Dec 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
|
||||||
|
iputils-20100418-r1.ebuild:
|
||||||
|
x86 stable wrt bug #342277
|
||||||
|
|
||||||
|
*iputils-20100418-r1 (14 Sep 2010)
|
||||||
|
|
||||||
|
14 Sep 2010; Mike Frysinger <vapier@gentoo.org> +iputils-20100418-r1.ebuild,
|
||||||
|
+files/iputils-20100418-arping-broadcast.patch:
|
||||||
|
Add fix for arping broadcast handling #337049 by Aleksander Machniak.
|
||||||
|
|
||||||
|
06 Sep 2010; Brent Baude <ranger@gentoo.org> iputils-20100418.ebuild:
|
||||||
|
Marking iputils-20100418 ppc64 for bug 332527
|
||||||
|
|
||||||
|
04 Sep 2010; Raúl Porcel <armin76@gentoo.org> iputils-20100418.ebuild:
|
||||||
|
alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #332527
|
||||||
|
|
||||||
|
31 Aug 2010; Mike Frysinger <vapier@gentoo.org> iputils-20100418.ebuild,
|
||||||
|
+files/iputils-20100418-openssl.patch, +files/iputils-20100418-so_mark.patch:
|
||||||
|
Make openssl support optional #335436 by Jorge Manuel B. S. Vicetto. Fix
|
||||||
|
building with older linux headers #335347 by Mark Wagner.
|
||||||
|
|
||||||
|
30 Aug 2010; Jeroen Roovers <jer@gentoo.org> iputils-20100418.ebuild:
|
||||||
|
Stable for HPPA PPC (bug #332527).
|
||||||
|
|
||||||
|
29 Aug 2010; Markos Chandras <hwoarang@gentoo.org>
|
||||||
|
iputils-20100418.ebuild:
|
||||||
|
Stable on amd64 wrt bug #332527
|
||||||
|
|
||||||
|
28 Aug 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
|
||||||
|
iputils-20100418.ebuild:
|
||||||
|
x86 stable wrt security bug #332527
|
||||||
|
|
||||||
|
22 Aug 2010; Luca Barbato <lu_zero@gentoo.org>
|
||||||
|
+files/iputils-20100418-proper-libs.patch, iputils-20100418.ebuild:
|
||||||
|
Fix cross compilation
|
||||||
|
|
||||||
|
14 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org>
|
||||||
|
iputils-20100418.ebuild:
|
||||||
|
Add missing dependency over sysfsutils (bug #332703, reported by Ryan
|
||||||
|
Hill, diagnosed by Lars Wendler).
|
||||||
|
|
||||||
|
*iputils-20100418 (14 Aug 2010)
|
||||||
|
|
||||||
|
14 Aug 2010; Mike Frysinger <vapier@gentoo.org> +iputils-20100418.ebuild,
|
||||||
|
+files/iputils-20100418-aliasing.patch,
|
||||||
|
+files/iputils-20100418-makefile.patch,
|
||||||
|
+files/iputils-20100418-ping-CVE-2010-2529.patch,
|
||||||
|
+files/iputils-20100418-printf-size.patch:
|
||||||
|
Version bump #306101 by Andrew Brouwers. Add fix for ping CVE-2010-2529
|
||||||
|
#332527 by Tim Sammut.
|
||||||
|
|
||||||
|
07 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
|
||||||
|
iputils-20071127-r2.ebuild:
|
||||||
|
Transfer Prefix keywords
|
||||||
|
|
||||||
|
23 Aug 2009; Diego E. Pettenò <flameeyes@gentoo.org>
|
||||||
|
iputils-20070202.ebuild:
|
||||||
|
Drop to ~mips (for docbook cleanup).
|
||||||
|
|
||||||
|
*iputils-20071127-r2 (10 Jun 2008)
|
||||||
|
|
||||||
|
10 Jun 2008; <chainsaw@gentoo.org>
|
||||||
|
+files/iputils-20071127-nonroot-floodping.patch,
|
||||||
|
+iputils-20071127-r2.ebuild:
|
||||||
|
Introduce USE=SECURITY_HAZARD which allows non-root users to floodping.
|
||||||
|
This can be useful in some IXP/ISP environments where 10Gbit fibre links
|
||||||
|
have to be tested. As the name suggests, it should not be enabled unless
|
||||||
|
you know it makes sense for your situation.
|
||||||
|
|
||||||
|
*iputils-20071127-r1 (20 Apr 2008)
|
||||||
|
|
||||||
|
20 Apr 2008; Mike Frysinger <vapier@gentoo.org>
|
||||||
|
+files/iputils-20070202-idn.patch, +iputils-20071127-r1.ebuild:
|
||||||
|
Add support for USE=idn #218638 by Hanno Boeck.
|
||||||
|
|
||||||
|
20 Apr 2008; Mike Frysinger <vapier@gentoo.org> iputils-20071127.ebuild:
|
||||||
|
Mark amd64 stable.
|
||||||
|
|
||||||
|
31 Mar 2008; Sven Wegener <swegener@gentoo.org> iputils-20071127.ebuild:
|
||||||
|
Use mirror://gentoo/ for the manpages.
|
||||||
|
|
||||||
|
29 Mar 2008; Raúl Porcel <armin76@gentoo.org> iputils-20071127.ebuild:
|
||||||
|
alpha/ia64/sparc stable wrt #214734
|
||||||
|
|
||||||
|
29 Mar 2008; Jeroen Roovers <jer@gentoo.org> iputils-20071127.ebuild:
|
||||||
|
Stable for HPPA (bug #214734).
|
||||||
|
|
||||||
|
29 Mar 2008; Brent Baude <ranger@gentoo.org> ChangeLog:
|
||||||
|
Marking iputils-20071127 ppc for bug 214734
|
||||||
|
|
||||||
|
29 Mar 2008; Brent Baude <ranger@gentoo.org> iputils-20071127.ebuild:
|
||||||
|
stable ppc64, bug 214734
|
||||||
|
|
||||||
|
29 Mar 2008; Dawid Węgliński <cla@gentoo.org> iputils-20071127.ebuild:
|
||||||
|
Stable on x86 (bug #214734)
|
||||||
|
|
||||||
|
29 Mar 2008; Mike Frysinger <vapier@gentoo.org> iputils-20071127.ebuild:
|
||||||
|
Fixup manpage install.
|
||||||
|
|
||||||
|
28 Mar 2008; Brent Baude <ranger@gentoo.org> iputils-20071127.ebuild:
|
||||||
|
stable ppc, bug 214734
|
||||||
|
|
||||||
|
*iputils-20071127 (26 Jan 2008)
|
||||||
|
|
||||||
|
26 Jan 2008; Mike Frysinger <vapier@gentoo.org>
|
||||||
|
+files/iputils-20071127-gcc34.patch,
|
||||||
|
+files/iputils-20071127-kernel-ifaddr.patch, +iputils-20071127.ebuild:
|
||||||
|
Version bump #207289.
|
||||||
|
|
||||||
|
28 Oct 2007; Mike Frysinger <vapier@gentoo.org> iputils-20070202.ebuild:
|
||||||
|
Block net-misc/rarpd #197110 by kouyu.
|
||||||
|
|
||||||
|
21 Oct 2007; nixnut <nixnut@gentoo.org> iputils-20070202.ebuild:
|
||||||
|
Stable on ppc wrt bug 195915
|
||||||
|
|
||||||
|
19 Oct 2007; Raúl Porcel <armin76@gentoo.org> iputils-20070202.ebuild:
|
||||||
|
alpha/ia64/sparc stable wrt #195915
|
||||||
|
|
||||||
|
16 Oct 2007; Christoph Mende <angelos@gentoo.org> iputils-20070202.ebuild:
|
||||||
|
Stable on amd64 wrt bug #195915
|
||||||
|
|
||||||
|
16 Oct 2007; Markus Rothe <corsair@gentoo.org> iputils-20070202.ebuild:
|
||||||
|
Stable on ppc64; bug #195915
|
||||||
|
|
||||||
|
15 Oct 2007; Christian Faulhammer <opfer@gentoo.org>
|
||||||
|
iputils-20070202.ebuild:
|
||||||
|
stable x86, bug 195915
|
||||||
|
|
||||||
|
15 Oct 2007; Jeroen Roovers <jer@gentoo.org> iputils-20070202.ebuild:
|
||||||
|
Stable for HPPA (bug #195915).
|
||||||
|
|
||||||
|
15 Oct 2007; Mike Frysinger <vapier@gentoo.org>
|
||||||
|
+files/iputils-20070202-no-open-max.patch, iputils-20070202.ebuild:
|
||||||
|
Fix building with newer kernel headers that lack OPEN_MAX #195861 by Markus
|
||||||
|
Meier.
|
||||||
|
|
||||||
|
*iputils-99999999 (30 Apr 2007)
|
||||||
|
|
||||||
|
30 Apr 2007; Mike Frysinger <vapier@gentoo.org> +iputils-99999999.ebuild:
|
||||||
|
Live git version.
|
||||||
|
|
||||||
|
09 Feb 2007; Alexander H. Færøy <eroyf@gentoo.org>
|
||||||
|
iputils-20060512.ebuild:
|
||||||
|
Stable on MIPS; bug #165179
|
||||||
|
|
||||||
|
05 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org>
|
||||||
|
iputils-20060512.ebuild:
|
||||||
|
Stable on alpha wrt bug #165179.
|
||||||
|
|
||||||
|
05 Feb 2007; Jeroen Roovers <jer@gentoo.org> iputils-20060512.ebuild:
|
||||||
|
Stable for HPPA (bug #165179).
|
||||||
|
|
||||||
|
04 Feb 2007; Steve Dibb <beandog@gentoo.org> iputils-20060512.ebuild:
|
||||||
|
amd64 stable, bug 165179
|
||||||
|
|
||||||
|
04 Feb 2007; nixnut <nixnut@gentoo.org> iputils-20060512.ebuild:
|
||||||
|
Stable on ppc wrt bug 165179
|
||||||
|
|
||||||
|
04 Feb 2007; Markus Rothe <corsair@gentoo.org> iputils-20060512.ebuild:
|
||||||
|
Added ~ppc64; bug #165179
|
||||||
|
|
||||||
|
03 Feb 2007; Torsten Veller <tove@gentoo.org> iputils-20060512.ebuild:
|
||||||
|
Stable on x86 (#165179)
|
||||||
|
|
||||||
|
03 Feb 2007; Jason Wever <weeve@gentoo.org> iputils-20060512.ebuild:
|
||||||
|
Stable on SPARC wrt bug #165179.
|
||||||
|
|
||||||
|
*iputils-20070202 (03 Feb 2007)
|
||||||
|
|
||||||
|
03 Feb 2007; Mike Frysinger <vapier@gentoo.org>
|
||||||
|
+files/iputils-20070202-makefile.patch, +iputils-20070202.ebuild:
|
||||||
|
Version bump.
|
||||||
|
|
||||||
|
21 Dec 2006; Mike Frysinger <vapier@gentoo.org> iputils-20060512.ebuild:
|
||||||
|
Only generate man pages for USE=doc until next release where they include
|
||||||
|
man pages #158660.
|
||||||
|
|
||||||
|
*iputils-20060512 (20 Dec 2006)
|
||||||
|
|
||||||
|
20 Dec 2006; Mike Frysinger <vapier@gentoo.org>
|
||||||
|
+files/iputils-20060512-RFC3542.patch, +files/iputils-20060512-gcc4.patch,
|
||||||
|
+files/iputils-20060512-kernel-ifaddr.patch,
|
||||||
|
+files/iputils-20060512-linux-headers.patch,
|
||||||
|
+files/iputils-20060512-makefile.patch, +iputils-20060512.ebuild:
|
||||||
|
Version bump.
|
||||||
|
|
||||||
|
20 Aug 2006; Mike Frysinger <vapier@gentoo.org>
|
||||||
|
+files/iputils-021109-ipv6-updates.patch, iputils-021109-r3.ebuild:
|
||||||
|
Handle ipv6 define updates in newer kernels #134751 by Mekong.
|
||||||
|
|
||||||
|
08 Jun 2006; Mike Frysinger <vapier@gentoo.org>
|
||||||
|
+files/iputils-021109-gcc4.patch, iputils-021109-r3.ebuild:
|
||||||
|
Fixup a lot of incorrect type use.
|
||||||
|
|
||||||
|
06 May 2006; Mike Frysinger <vapier@gentoo.org> iputils-021109-r3.ebuild:
|
||||||
|
Generate a ping6.8 symlink to ping.8 as pointed out by Matej Stepanek #132010.
|
||||||
|
|
||||||
|
29 May 2005; <solar@gentoo.org> iputils-021109-r3.ebuild:
|
||||||
|
echangelog - update package to use libc expanded variable elibc_uclibc vs
|
||||||
|
uclibc so USE=-* works
|
||||||
|
|
||||||
|
02 May 2005; Mike Frysinger <vapier@gentoo.org>
|
||||||
|
+files/iputils-021109-bindnow.patch, -files/021109-gcc34.patch,
|
||||||
|
+files/iputils-021109-gcc34.patch, iputils-021109-r3.ebuild:
|
||||||
|
Update the gcc-inline patch by Dave Stahl #80969 and fix lazy bindings for
|
||||||
|
setuid apps #77526.
|
||||||
|
|
||||||
|
18 Jan 2005; Mike Frysinger <vapier@gentoo.org>
|
||||||
|
-files/iputils-021109-pfkey.patch, iputils-021109-r3.ebuild:
|
||||||
|
Punt setkey since ipsec-tools exists now to handle it #78588.
|
||||||
|
|
||||||
|
03 Jan 2005; Mike Frysinger <vapier@gentoo.org> iputils-021109-r3.ebuild:
|
||||||
|
Restore USE=doc with an extra check in case we're in the middle of a
|
||||||
|
bootstrap #23156.
|
||||||
|
|
||||||
|
03 Jan 2005; Mike Frysinger <vapier@gentoo.org> iputils-021109-r3.ebuild:
|
||||||
|
Make sure linux/ipsec.h is usuable before building ipsec stuff #67569.
|
||||||
|
|
||||||
|
03 Jan 2005; Mike Frysinger <vapier@gentoo.org>
|
||||||
|
+files/021109-ipg-linux-2.6.patch, iputils-021109-r3.ebuild:
|
||||||
|
Add support to ipg for newer kernels #71756 by Christoph M.
|
||||||
|
|
||||||
|
06 Oct 2004; Travis Tilley <lv@gentoo.org>
|
||||||
|
+files/iputils-021109-linux-udp-header.patch, iputils-021109-r3.ebuild:
|
||||||
|
fix compiling iputils using newer glibc snapshots
|
||||||
|
|
||||||
|
04 Aug 2004; Jon Portnoy <avenj@gentoo.org> iputils-021109-r3.ebuild :
|
||||||
|
Fix bison sed line. Bugs 59414 and 59191.
|
||||||
|
|
||||||
|
01 Jul 2004; Jon Hood <squinky86@gentoo.org> iputils-020927.ebuild,
|
||||||
|
iputils-021109-r3.ebuild:
|
||||||
|
virtual/glibc -> virtual/libc
|
||||||
|
|
||||||
|
28 Jun 2004; Brandon Hale <tseng@gentoo.org> iputils-021109-r3.ebuild:
|
||||||
|
Stable on x86.
|
||||||
|
|
||||||
|
15 Jun 2004; <solar@gentoo.org> iputils-021109-r3.ebuild,
|
||||||
|
files/iputils-20020927-no-ether_ntohost.patch:
|
||||||
|
added patch to allow iputils to compile with uclibc
|
||||||
|
|
||||||
|
14 Jun 2004; Aron Griffis <agriffis@gentoo.org> iputils-020927.ebuild:
|
||||||
|
Fix use invocation
|
||||||
|
|
||||||
|
*iputils-021109-r3 (24 Apr 2004)
|
||||||
|
|
||||||
|
24 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
|
||||||
|
Remove racoon since (1) net-firewall/ipsec-tools installs this and
|
||||||
|
(2) the packaged racoon has a nice remote DoS #48847.
|
||||||
|
|
||||||
|
*iputils-021109-r2 (07 Apr 2004)
|
||||||
|
|
||||||
|
09 Apr 2004; Travis Tilley <lv@gentoo.org> iputils-021109-r1.ebuild:
|
||||||
|
marked stable on amd64
|
||||||
|
|
||||||
|
08 Apr 2004; Joshua Kinard <kumba@gentoo.org> iputils-020927.ebuild:
|
||||||
|
Typo fix
|
||||||
|
|
||||||
|
07 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
|
||||||
|
Clean up src_unpack and src_compile steps and add flex/openssl to DEPEND #38774.
|
||||||
|
|
||||||
|
23 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> iputils-021109-r1.ebuild:
|
||||||
|
Closing #44555.
|
||||||
|
|
||||||
|
01 Mar 2004; Tom Gall <tgall@gentoo.org> iputils-021109-r1.ebuild:
|
||||||
|
make sure ppc64 has yacc dependancy
|
||||||
|
|
||||||
|
16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> :
|
||||||
|
set ppc in keywords
|
||||||
|
|
||||||
|
13 Jan 2004; Ned Ludd <solar@gentoo.org> iputils-021109-r1.ebuild:
|
||||||
|
Make ipv6 traceroute6, tracepath6 and ping6 made optional based on
|
||||||
|
ipv6 use flag. Prepare for x86 stable in the next day to two for
|
||||||
|
GRP release.
|
||||||
|
|
||||||
|
*iputils-021109-r1 (13 Jan 2004)
|
||||||
|
|
||||||
|
12 Jan 2004; Luca Barbato <lu_zero@gentoo.org> iputils-021109.ebuild:
|
||||||
|
Marked ppc to match the linux-headers changes
|
||||||
|
|
||||||
|
08 Jan 2004; <plasmaroo@gentoo.org> iputils-021109.ebuild:
|
||||||
|
Added 2.6 support; this now installs setkey and racoon if you have 2.6
|
||||||
|
headers.
|
||||||
|
|
||||||
|
*iputils-021109 (16 Nov 2003)
|
||||||
|
|
||||||
|
16 Nov 2003; Joshua Kinard <kumba@gentoo.org> iputils-021109.ebuild:
|
||||||
|
Version bump to a package that appears to be beta. It builds against 2.4.22+
|
||||||
|
linux-headers, however, so worth testing.
|
||||||
|
|
||||||
|
*iputils-020927 (03 Jan 2003)
|
||||||
|
|
||||||
|
21 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
|
||||||
|
Add static support #29202.
|
||||||
|
|
||||||
|
12 Aug 2003; Jason Wever <weeve@gentoo.org> iputils-020927.ebuild:
|
||||||
|
Changed ~sparc keyword to sparc.
|
||||||
|
|
||||||
|
07 Jul 2003; Jan Seidel <tuxus@gentoo.org> iputils-020927.ebuild:
|
||||||
|
Mark stable on mips
|
||||||
|
|
||||||
|
01 Jul 2003; Luca Barbato <lu_zero@gentoo.org> iputils-020927.ebuild:
|
||||||
|
Mark stable on ppc
|
||||||
|
|
||||||
|
24 Jun 2003; Aron Griffis <agriffis@gentoo.org> iputils-020927.ebuild:
|
||||||
|
Mark stable on alpha
|
||||||
|
|
||||||
|
20 Jun 2003; Jon Portnoy <avenj@gentoo.org> iputils-020927.ebuild :
|
||||||
|
Temporarily yanked out all of the USE="doc" stuff until a more
|
||||||
|
permanent fix can be implemented. Was breaking emerge system for
|
||||||
|
users with doc in USE.
|
||||||
|
|
||||||
|
06 Apr 2003; Guy Martin <gmsoft@gentoo.org> iputils-020927.ebuild :
|
||||||
|
Marked stable on hppa. Changed depend sys-kernel/linux-headers to virtual/os-headers.
|
||||||
|
|
||||||
|
24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> iputils-020927.ebuild :
|
||||||
|
Added testing mips keyword to the ebuild.
|
||||||
|
|
||||||
|
03 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> iputils-020927.ebuild :
|
||||||
|
Version bump, found by Torgeir Hansen <torgeir@trenger.ro> in #13052.
|
||||||
|
Made use of "doc" use variable to decide whetever to depend on openjade to
|
||||||
|
compile and install documentation.
|
||||||
|
|
||||||
|
03 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> iputils-020124-r1.ebuild :
|
||||||
|
Changed where the bins are installed. Also made ping and traceroute tools setuid.
|
||||||
|
Closes #10090.
|
||||||
|
|
||||||
|
06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
|
||||||
|
|
||||||
|
*iputils-020124-r1 (16 Aug 2002)
|
||||||
|
|
||||||
|
06 Apr 2003; Guy Martin <gmsoft@gentoo.org> iputils-020124-r1.ebuild :
|
||||||
|
Changed depend sys-kernel/linux-headers to virtual/os-headers.
|
||||||
|
|
||||||
|
12 Feb 2003; Guy Martin <gmsoft@gentoo.org> iputils-020124-r1.ebuild :
|
||||||
|
Added hppa to keywords.
|
||||||
|
|
||||||
|
24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> iputils-020124-r1.ebuild :
|
||||||
|
Added stable mips keyword to the ebuild.
|
||||||
|
|
||||||
|
16 Aug 2002; Matthew Turk <satai@gentoo.org> ChangeLog:
|
||||||
|
|
||||||
|
Updated by enabling documentation; recent changes in DocBook ebuilds have
|
||||||
|
fixed the outstanding issues.
|
||||||
|
|
||||||
|
*iputils-020124 (16 Jul 2002)
|
||||||
|
|
||||||
|
24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> iputils-020124.ebuild :
|
||||||
|
Added stable mips keyword to the ebuild.
|
||||||
|
|
||||||
|
16 Jul 2002; Grant Goodyear <g2boojum@gentoo.org> ChangeLog :
|
||||||
|
|
||||||
|
new package
|
||||||
27
sdk_container/src/third_party/portage-stable/net-misc/iputils/Manifest
vendored
Normal file
27
sdk_container/src/third_party/portage-stable/net-misc/iputils/Manifest
vendored
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
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
|
||||||
|
AUX iputils-20071127-kernel-ifaddr.patch 1467 SHA256 24d24c86676c8d6febb52650e53f202051ec9f185932b87d8400eee0f77f569e SHA512 a7cfd4f660a0742509d6e7b3985d81404ebef453fd32fd2a28118bc7304ba957e8306c6acd16609d88c41918fa49c9ae9c83c59e16fedd951cbdcbff544b17b7 WHIRLPOOL 89958a184cd4f4ff59b880c17f995bf16a4957ba163f3989d3ea2d99e8d2c1a603101ee9194c3f17970dc452fc52d8cf251da75e259846da9fcf4e20a9e8893f
|
||||||
|
AUX iputils-20071127-nonroot-floodping.patch 497 SHA256 f0c7c2d4843873da96f795fb766a65ed39b6d8ab74ae4aa5a47444c9a3db0e52 SHA512 96ea32977cdb2e3c98341b75214a35e88296600d14bc929f7691951325be8e90e8ff6ccf83fb2419db3c910a8169fb2a4348000fab33679039ec5cf2d07a3ee8 WHIRLPOOL 1f880978cf70188d0d59e79396f8c5962655c00cbf7f7c7adb800316dea1b6748ddbc788681c9831edf0fbb1153e85b5ca35e0e3c131b0a5b4884fa511119c0c
|
||||||
|
AUX iputils-20100418-aliasing.patch 2897 SHA256 8df8b1c510a1630d06d71f801d57c9182729f0308545026b999868ad55469914 SHA512 d50595a1c4a6f4b54099050569cde2fb1e5ebe553cca7d45d6cc674b075086b7d1fc54816ca92bc5856dc14e62b6d20b5ebc1c39cc1786f46a96b7e08bdca3ad WHIRLPOOL 129ff37eff62a115cfdbfe6ae5a6b529cb290a909dace4d5e71ffd37aa7707d3313c0de1e7bf31a41c9ec0b7365ef05d9a406c85cb96dbffe418b3e78e62c6c7
|
||||||
|
AUX iputils-20100418-makefile.patch 974 SHA256 910914b0184a65aa15d42979bb7e3d272697310231005673cf2f46648deb6a4b SHA512 c3c9096cd2587e39afdd0a78291a4f67249e2fc75c303cd648a795f7c88dc7e9e2c27f3f56fe6d7d40bdcb0d179dfd35f1c991ba8fd3524149f8cbb94d9ef0ca WHIRLPOOL b4fa577f4b52792165abda924a1980fb1101c7f5a15714b4a9647535e5be622c54e6ef0f731212a74b1a6fc1ddfcf54f98e5c0a0c540e0113823e7646dd6df8a
|
||||||
|
AUX iputils-20100418-openssl.patch 628 SHA256 4e009a36451b599b2717ec6c6d7d9adb4723d7629fffaf07a5926ee80af9a3ea SHA512 c7bf0317e893386172e65679ead3e1eebcb7805f96f99de4170df495fc9ed573b03b51a1ab69bc0390705914cba72b61e5e33a454eb8ec43a7fd07ae50ffb3dc WHIRLPOOL a3b53d485d948a50dc988af65eaafa73fc08d88cbc2731061ae5607e110f01af3cd009e2287a9a633728768def7702392fae7ccb17e322bee214bee76c958553
|
||||||
|
AUX iputils-20100418-printf-size.patch 1658 SHA256 95ce6cdf73cd5dbfbd962131fc1f6513713d4874ca161f5b24eaed21d58a1cfc SHA512 556237d39043815f196b0f22ec552bfb52ad2d45b2faf67e26712361bc11acd21cec42b8241ccf72778b421b9f456a37e9466dbfc03c0df2be1e1bb5ae48a92e WHIRLPOOL 80d03f09a6b023413845f5fe12e6decd87e70c143ad79215d66b1fd29c42bf7b61580addac910dd2134c9d4bf41432f21c7a63184e76aa1bdd936621da6b12d6
|
||||||
|
AUX iputils-20100418-proper-libs.patch 427 SHA256 6566f7dd311df08ed51a03758ef3137a24b1883452f86df1821bc266c6d1616f SHA512 b6f42a1dda591ccde770a665387ff3a0c0fe925180487ef57852ad5a76f1bd781d56e3266894e8868d84a7016f7d6fecf1068e4ced7b1e104a9a54b08ed4427c WHIRLPOOL d2f7bb97bb2871b2a84412da5303b87cdefa0b3d5fe115fbaad6fb6b58907c83f39c04e3573e7cef76401f66beee698ac0676f0fdfadeaff6ab79b2d3a6476b7
|
||||||
|
AUX iputils-20100418-so_mark.patch 597 SHA256 3c0c3e93d3b458a02f856be3681c2dd5bfb18933e4752e90dc277cdd353b3576 SHA512 453ef3f8c53e2c2cef54f19219b892e51a83a6109f73a4f10712aec729509f02e6b830ab7ca85843a70f3d9c9860f084b256290f638741d573a5205ba89fe469 WHIRLPOOL 502e9ee110555644fd7d19d64afba3d2777844faca6fe0111b4b7356e3262c011b8de13475db1e70dff9225e3883d7e3e27d1f96f240a80d4c5c9ab0a29c9560
|
||||||
|
AUX iputils-20101006-owl-pingsock.diff 6390 SHA256 1425efd6d30e6c9682569ff1de731922351048f81df44a2ebad30cca85fc51c9 SHA512 0e609aa8088572244a57d719124df2719d5b0a3b37861afb08aa434192c1801e03617254b7caca8f47749cf72c2da8c52f007eb0c136a64f5abd44ad9960cc1d WHIRLPOOL dc9824a7761fd384e8a5c991d02201cb18b4aeb666a0d83ca18ce0e59216a46831a219629d796beacb048fb647841d178d64f478288b8e9d2766e10f2d129a10
|
||||||
|
AUX iputils-20121221-crypto-build.patch 1325 SHA256 cafc281c70d46f2964489b4c19c981bcf203b4c6266d4f49437c3fe67e2027b2 SHA512 922daa01f00c19f8237515b2d3ab73b87daa957cfc491382def2ce1c098ffed943ad4952c94134f3155570f64353abf5348523ea773ce7eb457578f975cc92d2 WHIRLPOOL a39c7dbb9b37849cc3560dc1f814a8c18a9ff9b55e19c3587a7c49286d55323f96d42d33c6f2723d3868506c252272e1d2d6bc3370eb935b479c89514f03c9c5
|
||||||
|
AUX iputils-20121221-makefile.patch 1791 SHA256 779632822e3440f3b898a50955cb8fb72177f0d1623c9da7c0a8afa68313435f SHA512 5899942b73d4d13e0ff85f22a81e9107b2a04c82cac6b59559a521c5d0bf25007e34b61b2dfdb40c21b221a108f6ba72c1a51fa59359a400ad045c9394c176db WHIRLPOOL c0c13046265ad44d23bde66cf48f64803591b4577861fde0ad7873001cbd9284c8593ce277a39d077b5bab635d0f8aa53ad124ea724bbc4584db36570028f90f
|
||||||
|
AUX iputils-20121221-openssl.patch 2378 SHA256 cc1af5ccdd593b4fa43273cf7de8b9552f0a5d33a72a35fcc4f94cf2c6fc9a44 SHA512 05240c00d0a1f9f878a9826d54cbd0128c2ed5ce7cab4685907956156c3cf2131ccd563812b64490bf915a75f52851396966a590027fc4c1886b2d19f421718b WHIRLPOOL 66052233f933cf30fe1572578012faa380f53580307e880e9a94c001ea14e585b3e28693c8e3883ee6350bb6af04a6931732ebaa284c4e3851b64081e042d081
|
||||||
|
AUX iputils-20121221-owl-pingsock.diff 6374 SHA256 915e18ee5a03f5636b408ff34a5576ad8899a3d93d5fe8182984c3565bd94375 SHA512 2f2577230d8bc864adc562c4c5bf33cde3bbabfde633406165b2b61df4e13e2dba74c8561f70d88c3932fc49a41a0276533b715ade208c8608348e4d065c8395 WHIRLPOOL 205179fa205e8bd88a9077cf628ec1a060189ee01d55c45dbe754f3bc36a496531cb9eab120507eff5d72140c934a7480d6a015fa6020f7dcecdfbc6ef590443
|
||||||
|
AUX iputils-20121221-printf-size.patch 1671 SHA256 a1ed939d0e008bca06208ae34e3f17a0ddc66b50f1679f82a630b52cdfbd111a SHA512 ff5491ad5a0396bee41fcbfc1384699d396c24da093bd2209dead67f52efcec462dbfb4a43008083742d0139da7bd52e922499b5f7eae028384c74930453dd33 WHIRLPOOL 8582495e9c58a01c3aafe6d0c968df910e672af20d420980ba7503800ad75e308c62cd53f86b5aaa8ef9d232ee7a0a4ea7bb3d9cd9735045ae0f6a21f8e419ee
|
||||||
|
DIST iputils-s20101006-manpages.tar.bz2 21638 SHA256 071b13a9154070168204ff49fa2564b56e4a1706020a2923ba9d3198f317d954 SHA512 313f11bd59b89b4be33eb613140b23ead87c731abfb82944bde16fbb46d0c29f896d3c1a06f6bf0f92f103b5f867d25b361dbb4bba364a1393945e9c94ebe2ca WHIRLPOOL d0b394a21b660fa014b31c90dce28d2b28ccc72e4223ad0e206609f5e167ed21fc514dcc956f9545771f44649c75d9bf996b51a5d058ef59d7e12cb18f8dc64e
|
||||||
|
DIST iputils-s20101006.tar.bz2 94386 SHA256 fd3af46c80ebb99607c2ca1f2a3608b6fe828e25bbec6e54f2afd25f6ddb6ee7 SHA512 3a001e7a69074c6c48bd328c57ba9bd5e465bcc0005a03187ccd127d74ed4d083e76e43c34b123eb6cf246e16716b1e56613ffd611aa2eea83e70337a95e0360 WHIRLPOOL 4a9e95ef95806bcae74ebbb6716229a1326a2e7323318af6e242690ff359e51323aaefed5c8838605fdc9f977b48dca293c7b8db88bc629a4433d865297db19e
|
||||||
|
DIST iputils-s20121221-manpages.tar.bz2 23778 SHA256 6fc7ed7d281b7a2ee00e4f75e5465c90498c685bcc988afdff74db4eaa736d1c SHA512 006be62e61bf1555c99dbd5aac270cbd8d1074a3016fdde3aeed47e5c9b1acd326aa30a596c532d6688827f7f61966a6e3141eaa3b6f4f943eb21ac227282d8c WHIRLPOOL da0ccb577c4b2189553419df2c093404752fb2865eb3e0bfececfc242d930ceb44f96b32d945cfdd0c9ca060359651b2ec8479db5cc9220cda412dfeee5e910d
|
||||||
|
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-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
|
||||||
@ -0,0 +1,24 @@
|
|||||||
|
--- iputils/rarpd.c.mps 2004-06-10 15:27:01.000000000 +0200
|
||||||
|
+++ iputils/rarpd.c 2004-06-10 15:26:29.000000000 +0200
|
||||||
|
@@ -42,7 +42,9 @@ int listen_arp;
|
||||||
|
char *ifname;
|
||||||
|
char *tftp_dir = "/etc/tftpboot";
|
||||||
|
|
||||||
|
+#ifndef __UCLIBC__
|
||||||
|
extern int ether_ntohost(char *name, unsigned char *ea);
|
||||||
|
+#endif
|
||||||
|
void usage(void) __attribute__((noreturn));
|
||||||
|
|
||||||
|
struct iflink
|
||||||
|
@@ -305,7 +307,11 @@ struct rarp_map *rarp_lookup(int ifindex
|
||||||
|
6,
|
||||||
|
};
|
||||||
|
|
||||||
|
+#ifndef __UCLIBC__
|
||||||
|
if (ether_ntohost(ename, lladdr) != 0 ||
|
||||||
|
+#else
|
||||||
|
+ if (
|
||||||
|
+#endif
|
||||||
|
(hp = gethostbyname(ename)) == NULL) {
|
||||||
|
if (verbose)
|
||||||
|
syslog(LOG_INFO, "not found in /etc/ethers");
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
--- 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>
|
||||||
158
sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20070202-idn.patch
vendored
Normal file
158
sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20070202-idn.patch
vendored
Normal file
@ -0,0 +1,158 @@
|
|||||||
|
sniped from Fedora and made to not suck
|
||||||
|
|
||||||
|
http://bugs.gentoo.org/218638
|
||||||
|
|
||||||
|
--- iputils-s20070202/Makefile
|
||||||
|
+++ iputils-s20070202/Makefile
|
||||||
|
@@ -22,6 +22,11 @@
|
||||||
|
|
||||||
|
all: $(TARGETS)
|
||||||
|
|
||||||
|
+ifeq ($(IDN),yes)
|
||||||
|
+CPPFLAGS += -DIDN
|
||||||
|
+ping: LDLIBS += -lidn
|
||||||
|
+ping6: LDLIBS += -lidn
|
||||||
|
+endif
|
||||||
|
|
||||||
|
tftpd: tftpd.o tftpsubs.o
|
||||||
|
ping: ping.o ping_common.o
|
||||||
|
--- iputils-s20070202/ping.c
|
||||||
|
+++ iputils-s20070202/ping.c
|
||||||
|
@@ -58,6 +58,11 @@
|
||||||
|
* This program has to run SUID to ROOT to access the ICMP socket.
|
||||||
|
*/
|
||||||
|
|
||||||
|
+#ifdef IDN
|
||||||
|
+#include <idna.h>
|
||||||
|
+#include <locale.h>
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#include "ping_common.h"
|
||||||
|
|
||||||
|
#include <netinet/ip.h>
|
||||||
|
@@ -122,6 +128,12 @@
|
||||||
|
char *target, hnamebuf[MAXHOSTNAMELEN];
|
||||||
|
char rspace[3 + 4 * NROUTES + 1]; /* record route space */
|
||||||
|
|
||||||
|
+#ifdef IDN
|
||||||
|
+ char *idn;
|
||||||
|
+ int rc = 0;
|
||||||
|
+ setlocale(LC_ALL, "");
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
|
||||||
|
socket_errno = errno;
|
||||||
|
|
||||||
|
@@ -242,13 +254,35 @@
|
||||||
|
if (argc == 1)
|
||||||
|
options |= F_NUMERIC;
|
||||||
|
} else {
|
||||||
|
+#ifdef IDN
|
||||||
|
+ rc = idna_to_ascii_lz (target, &idn, 0);
|
||||||
|
+ if (rc == IDNA_SUCCESS)
|
||||||
|
+ hp = gethostbyname (idn);
|
||||||
|
+ else {
|
||||||
|
+ fprintf(stderr, "ping: IDN encoding of '%s' failed with error code %d\n", target, rc);
|
||||||
|
+ exit(2);
|
||||||
|
+ }
|
||||||
|
+ free(idn);
|
||||||
|
+#else
|
||||||
|
hp = gethostbyname(target);
|
||||||
|
+#endif
|
||||||
|
if (!hp) {
|
||||||
|
fprintf(stderr, "ping: unknown host %s\n", target);
|
||||||
|
exit(2);
|
||||||
|
}
|
||||||
|
memcpy(&whereto.sin_addr, hp->h_addr, 4);
|
||||||
|
+#ifdef IDN
|
||||||
|
+ rc = idna_to_unicode_lzlz (hp->h_name, &idn, 0);
|
||||||
|
+ if (rc == IDNA_SUCCESS)
|
||||||
|
+ strncpy(hnamebuf, idn, sizeof(hnamebuf) - 1);
|
||||||
|
+ else {
|
||||||
|
+ fprintf(stderr, "ping: IDN encoding of '%s' failed with error code %d\n", hp->h_name, rc);
|
||||||
|
+ exit(2);
|
||||||
|
+ }
|
||||||
|
+ free(idn);
|
||||||
|
+#else
|
||||||
|
strncpy(hnamebuf, hp->h_name, sizeof(hnamebuf) - 1);
|
||||||
|
+#endif
|
||||||
|
hnamebuf[sizeof(hnamebuf) - 1] = 0;
|
||||||
|
hostname = hnamebuf;
|
||||||
|
}
|
||||||
|
--- iputils-s20070202/ping6.c
|
||||||
|
+++ iputils-s20070202/ping6.c
|
||||||
|
@@ -66,6 +66,13 @@
|
||||||
|
* More statistics could always be gathered.
|
||||||
|
* This program has to run SUID to ROOT to access the ICMP socket.
|
||||||
|
*/
|
||||||
|
+#ifdef IDN
|
||||||
|
+#ifndef _GNU_SOURCE
|
||||||
|
+#define _GNU_SOURCE
|
||||||
|
+#endif
|
||||||
|
+#include <locale.h>
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#include "ping_common.h"
|
||||||
|
|
||||||
|
#include <linux/filter.h>
|
||||||
|
@@ -210,6 +216,10 @@
|
||||||
|
int err, csum_offset, sz_opt;
|
||||||
|
static uint32_t scope_id = 0;
|
||||||
|
|
||||||
|
+#ifdef IDN
|
||||||
|
+ setlocale(LC_ALL, "");
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
icmp_sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
|
||||||
|
socket_errno = errno;
|
||||||
|
|
||||||
|
@@ -296,6 +306,9 @@
|
||||||
|
|
||||||
|
memset(&hints, 0, sizeof(hints));
|
||||||
|
hints.ai_family = AF_INET6;
|
||||||
|
+#ifdef IDN
|
||||||
|
+ hints.ai_flags = AI_IDN;
|
||||||
|
+#endif
|
||||||
|
gai = getaddrinfo(target, NULL, &hints, &ai);
|
||||||
|
if (gai) {
|
||||||
|
fprintf(stderr, "unknown host\n");
|
||||||
|
@@ -328,6 +341,9 @@
|
||||||
|
|
||||||
|
memset(&hints, 0, sizeof(hints));
|
||||||
|
hints.ai_family = AF_INET6;
|
||||||
|
+#ifdef IDN
|
||||||
|
+ hints.ai_flags = AI_IDN;
|
||||||
|
+#endif
|
||||||
|
gai = getaddrinfo(target, NULL, &hints, &ai);
|
||||||
|
if (gai) {
|
||||||
|
fprintf(stderr, "unknown host\n");
|
||||||
|
--- iputils-s20070202/ping_common.c
|
||||||
|
+++ iputils-s20070202/ping_common.c
|
||||||
|
@@ -1,3 +1,7 @@
|
||||||
|
+#ifdef IDN
|
||||||
|
+#include <locale.h>
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#include "ping_common.h"
|
||||||
|
#include <ctype.h>
|
||||||
|
#include <sched.h>
|
||||||
|
@@ -97,6 +102,9 @@
|
||||||
|
|
||||||
|
void common_options(int ch)
|
||||||
|
{
|
||||||
|
+#ifdef IDN
|
||||||
|
+ setlocale(LC_ALL, "C");
|
||||||
|
+#endif
|
||||||
|
switch(ch) {
|
||||||
|
case 'a':
|
||||||
|
options |= F_AUDIBLE;
|
||||||
|
@@ -222,6 +230,9 @@
|
||||||
|
default:
|
||||||
|
abort();
|
||||||
|
}
|
||||||
|
+#ifdef IDN
|
||||||
|
+ setlocale(LC_ALL, "");
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -0,0 +1,35 @@
|
|||||||
|
--- 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:
|
||||||
@ -0,0 +1,16 @@
|
|||||||
|
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);
|
||||||
|
|
||||||
134
sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20071127-gcc34.patch
vendored
Normal file
134
sdk_container/src/third_party/portage-stable/net-misc/iputils/files/iputils-20071127-gcc34.patch
vendored
Normal file
@ -0,0 +1,134 @@
|
|||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
@ -0,0 +1,280 @@
|
|||||||
|
Otherwise same as Fedora patch except for the Makefile part
|
||||||
|
|
||||||
|
http://bugs.gentoo.org/show_bug.cgi?id=377687
|
||||||
|
http://pkgs.fedoraproject.org/gitweb/?p=iputils.git;a=blob_plain;f=iputils-20071127-infiniband.patch;hb=HEAD
|
||||||
|
|
||||||
|
--- arping.c
|
||||||
|
+++ arping.c
|
||||||
|
@@ -32,8 +32,6 @@
|
||||||
|
#include <netinet/in.h>
|
||||||
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
|
-#include <sysfs/libsysfs.h>
|
||||||
|
-
|
||||||
|
#include "SNAPSHOT.h"
|
||||||
|
|
||||||
|
static void usage(void) __attribute__((noreturn));
|
||||||
|
@@ -52,14 +50,22 @@ int unicasting;
|
||||||
|
int s;
|
||||||
|
int broadcast_only;
|
||||||
|
|
||||||
|
-struct sockaddr_storage me;
|
||||||
|
-struct sockaddr_storage he;
|
||||||
|
+struct sockaddr_ll *me=NULL;
|
||||||
|
+struct sockaddr_ll *he=NULL;
|
||||||
|
|
||||||
|
struct timeval start, last;
|
||||||
|
|
||||||
|
int sent, brd_sent;
|
||||||
|
int received, brd_recv, req_recv;
|
||||||
|
|
||||||
|
+#define SYSFS_MNT_PATH "/sys"
|
||||||
|
+#define SYSFS_CLASS "class"
|
||||||
|
+#define SYSFS_NET "net"
|
||||||
|
+#define SYSFS_BROADCAST "broadcast"
|
||||||
|
+#define SYSFS_PATH_ENV "SYSFS_PATH"
|
||||||
|
+#define SYSFS_PATH_LEN 256
|
||||||
|
+#define SOCKADDR_LEN (2 * sizeof(struct sockaddr_ll))
|
||||||
|
+
|
||||||
|
#define MS_TDIFF(tv1,tv2) ( ((tv1).tv_sec-(tv2).tv_sec)*1000 + \
|
||||||
|
((tv1).tv_usec-(tv2).tv_usec)/1000 )
|
||||||
|
|
||||||
|
@@ -166,6 +172,10 @@ void finish(void)
|
||||||
|
printf("\n");
|
||||||
|
fflush(stdout);
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ free(me);
|
||||||
|
+ free(he);
|
||||||
|
+
|
||||||
|
if (dad)
|
||||||
|
exit(!!received);
|
||||||
|
if (unsolicited)
|
||||||
|
@@ -186,8 +196,7 @@ void catcher(void)
|
||||||
|
finish();
|
||||||
|
|
||||||
|
if (last.tv_sec==0 || MS_TDIFF(tv,last) > 500) {
|
||||||
|
- send_pack(s, src, dst,
|
||||||
|
- (struct sockaddr_ll *)&me, (struct sockaddr_ll *)&he);
|
||||||
|
+ send_pack(s, src, dst, me, he);
|
||||||
|
if (count == 0 && unsolicited)
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
@@ -234,7 +243,7 @@ int recv_pack(unsigned char *buf, int le
|
||||||
|
return 0;
|
||||||
|
if (ah->ar_pln != 4)
|
||||||
|
return 0;
|
||||||
|
- if (ah->ar_hln != ((struct sockaddr_ll *)&me)->sll_halen)
|
||||||
|
+ if (ah->ar_hln != me->sll_halen)
|
||||||
|
return 0;
|
||||||
|
if (len < sizeof(*ah) + 2*(4 + ah->ar_hln))
|
||||||
|
return 0;
|
||||||
|
@@ -245,7 +254,7 @@ int recv_pack(unsigned char *buf, int le
|
||||||
|
return 0;
|
||||||
|
if (src.s_addr != dst_ip.s_addr)
|
||||||
|
return 0;
|
||||||
|
- if (memcmp(p+ah->ar_hln+4, ((struct sockaddr_ll *)&me)->sll_addr, ah->ar_hln))
|
||||||
|
+ if (memcmp(p+ah->ar_hln+4, me->sll_addr, ah->ar_hln))
|
||||||
|
return 0;
|
||||||
|
} else {
|
||||||
|
/* DAD packet was:
|
||||||
|
@@ -263,7 +272,7 @@ int recv_pack(unsigned char *buf, int le
|
||||||
|
*/
|
||||||
|
if (src_ip.s_addr != dst.s_addr)
|
||||||
|
return 0;
|
||||||
|
- if (memcmp(p, ((struct sockaddr_ll *)&me)->sll_addr, ((struct sockaddr_ll *)&me)->sll_halen) == 0)
|
||||||
|
+ if (memcmp(p, me->sll_addr, me->sll_halen) == 0)
|
||||||
|
return 0;
|
||||||
|
if (src.s_addr && src.s_addr != dst_ip.s_addr)
|
||||||
|
return 0;
|
||||||
|
@@ -279,7 +288,7 @@ int recv_pack(unsigned char *buf, int le
|
||||||
|
printf("for %s ", inet_ntoa(dst_ip));
|
||||||
|
s_printed = 1;
|
||||||
|
}
|
||||||
|
- if (memcmp(p+ah->ar_hln+4, ((struct sockaddr_ll *)&me)->sll_addr, ah->ar_hln)) {
|
||||||
|
+ if (memcmp(p+ah->ar_hln+4, me->sll_addr, ah->ar_hln)) {
|
||||||
|
if (!s_printed)
|
||||||
|
printf("for ");
|
||||||
|
printf("[");
|
||||||
|
@@ -305,40 +314,67 @@ int recv_pack(unsigned char *buf, int le
|
||||||
|
if (quit_on_reply)
|
||||||
|
finish();
|
||||||
|
if(!broadcast_only) {
|
||||||
|
- memcpy(((struct sockaddr_ll *)&he)->sll_addr, p, ((struct sockaddr_ll *)&me)->sll_halen);
|
||||||
|
+ memcpy(he->sll_addr, p, me->sll_halen);
|
||||||
|
unicasting=1;
|
||||||
|
}
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
-void set_device_broadcast(char *device, unsigned char *ba, size_t balen)
|
||||||
|
+int get_sysfs_mnt_path(char *mnt_path, size_t len)
|
||||||
|
{
|
||||||
|
- struct sysfs_class_device *dev;
|
||||||
|
- struct sysfs_attribute *brdcast;
|
||||||
|
- unsigned char *p;
|
||||||
|
- int ch;
|
||||||
|
+ const char *sysfs_path_env;
|
||||||
|
+ int pth_len=0;
|
||||||
|
|
||||||
|
- dev = sysfs_open_class_device("net", device);
|
||||||
|
- if (!dev) {
|
||||||
|
- perror("sysfs_open_class_device(net)");
|
||||||
|
- exit(2);
|
||||||
|
- }
|
||||||
|
+ if (len == 0 || mnt_path == NULL)
|
||||||
|
+ return -1;
|
||||||
|
|
||||||
|
- brdcast = sysfs_get_classdev_attr(dev, "broadcast");
|
||||||
|
- if (!brdcast) {
|
||||||
|
- perror("sysfs_get_classdev_attr(broadcast)");
|
||||||
|
- exit(2);
|
||||||
|
- }
|
||||||
|
+ /* possible overrride of real mount path */
|
||||||
|
+ sysfs_path_env = getenv(SYSFS_PATH_ENV);
|
||||||
|
+ memset(mnt_path, 0, len);
|
||||||
|
+ strncpy(mnt_path,
|
||||||
|
+ sysfs_path_env != NULL ? sysfs_path_env : SYSFS_MNT_PATH,
|
||||||
|
+ len-1);
|
||||||
|
|
||||||
|
- if (sysfs_read_attribute(brdcast)) {
|
||||||
|
- perror("sysfs_read_attribute");
|
||||||
|
- exit(2);
|
||||||
|
- }
|
||||||
|
+ if ((pth_len = strlen(mnt_path)) > 0 && mnt_path[pth_len-1] == '/')
|
||||||
|
+ mnt_path[pth_len-1] = '\0';
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+int make_sysfs_broadcast_path(char *broadcast_path, size_t len)
|
||||||
|
+{
|
||||||
|
+ char mnt_path[SYSFS_PATH_LEN];
|
||||||
|
+
|
||||||
|
+ if (get_sysfs_mnt_path(mnt_path, len) != 0)
|
||||||
|
+ return -1;
|
||||||
|
|
||||||
|
- for (p = ba, ch = 0; p < ba + balen; p++, ch += 3)
|
||||||
|
- *p = strtoul(brdcast->value + ch, NULL, 16);
|
||||||
|
+ snprintf(broadcast_path, len,
|
||||||
|
+ "%s/" SYSFS_CLASS "/" SYSFS_NET "/%s/" SYSFS_BROADCAST,
|
||||||
|
+ mnt_path, device);
|
||||||
|
|
||||||
|
- return;
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+char * read_sysfs_broadcast(char *brdcast_path)
|
||||||
|
+{
|
||||||
|
+ int fd;
|
||||||
|
+ int len_to_read;
|
||||||
|
+ char *brdcast = NULL;
|
||||||
|
+
|
||||||
|
+ if ((fd = open(brdcast_path, O_RDONLY)) > -1) {
|
||||||
|
+ len_to_read = lseek(fd, 0L, SEEK_END);
|
||||||
|
+ if ((brdcast = malloc(len_to_read+1)) != NULL) {
|
||||||
|
+ lseek(fd, 0L, SEEK_SET);
|
||||||
|
+ memset(brdcast, 0, len_to_read+1);
|
||||||
|
+ if (read(fd, brdcast, len_to_read) == -1) {
|
||||||
|
+ free(brdcast);
|
||||||
|
+ brdcast = NULL;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ close(fd);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return brdcast;
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
@@ -356,6 +392,17 @@ main(int argc, char **argv)
|
||||||
|
exit(-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ me = malloc(SOCKADDR_LEN);
|
||||||
|
+ if (!me) {
|
||||||
|
+ fprintf(stderr, "arping: could not allocate memory\n");
|
||||||
|
+ exit(1);
|
||||||
|
+ }
|
||||||
|
+ he = malloc(SOCKADDR_LEN);
|
||||||
|
+ if (!he) {
|
||||||
|
+ fprintf(stderr, "arping: could not allocate memory\n");
|
||||||
|
+ exit(1);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
while ((ch = getopt(argc, argv, "h?bfDUAqc:w:s:I:V")) != EOF) {
|
||||||
|
switch(ch) {
|
||||||
|
case 'b':
|
||||||
|
@@ -504,34 +551,51 @@ main(int argc, char **argv)
|
||||||
|
close(probe_fd);
|
||||||
|
};
|
||||||
|
|
||||||
|
- ((struct sockaddr_ll *)&me)->sll_family = AF_PACKET;
|
||||||
|
- ((struct sockaddr_ll *)&me)->sll_ifindex = ifindex;
|
||||||
|
- ((struct sockaddr_ll *)&me)->sll_protocol = htons(ETH_P_ARP);
|
||||||
|
- if (bind(s, (struct sockaddr*)&me, sizeof(me)) == -1) {
|
||||||
|
+ me->sll_family = AF_PACKET;
|
||||||
|
+ me->sll_ifindex = ifindex;
|
||||||
|
+ me->sll_protocol = htons(ETH_P_ARP);
|
||||||
|
+ if (bind(s, (struct sockaddr*)me, SOCKADDR_LEN) == -1) {
|
||||||
|
perror("bind");
|
||||||
|
exit(2);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (1) {
|
||||||
|
- socklen_t alen = sizeof(me);
|
||||||
|
- if (getsockname(s, (struct sockaddr*)&me, &alen) == -1) {
|
||||||
|
+ socklen_t alen = SOCKADDR_LEN;
|
||||||
|
+ if (getsockname(s, (struct sockaddr*)me, &alen) == -1) {
|
||||||
|
perror("getsockname");
|
||||||
|
exit(2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
- if (((struct sockaddr_ll *)&me)->sll_halen == 0) {
|
||||||
|
+ if (me->sll_halen == 0) {
|
||||||
|
if (!quiet)
|
||||||
|
printf("Interface \"%s\" is not ARPable (no ll address)\n", device);
|
||||||
|
exit(dad?0:2);
|
||||||
|
}
|
||||||
|
|
||||||
|
- he = me;
|
||||||
|
+ memcpy(he, me, SOCKADDR_LEN);
|
||||||
|
|
||||||
|
#if 1
|
||||||
|
- set_device_broadcast(device, ((struct sockaddr_ll *)&he)->sll_addr,
|
||||||
|
- ((struct sockaddr_ll *)&he)->sll_halen);
|
||||||
|
+ char brdcast_path[SYSFS_PATH_LEN];
|
||||||
|
+ char *brdcast_val=NULL;
|
||||||
|
+ char *next_ch;
|
||||||
|
+
|
||||||
|
+ if (make_sysfs_broadcast_path(brdcast_path, sizeof brdcast_path) != 0) {
|
||||||
|
+ perror("sysfs attribute broadcast");
|
||||||
|
+ exit(2);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if ((brdcast_val = read_sysfs_broadcast(brdcast_path)) == NULL) {
|
||||||
|
+ perror("sysfs read broadcast value");
|
||||||
|
+ exit(2);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ for (ch=0; ch<he->sll_halen; ch++) {
|
||||||
|
+ he->sll_addr[ch] = strtol(brdcast_val + (ch*3), &next_ch, 16);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ free(brdcast_val);
|
||||||
|
#else
|
||||||
|
- memset(((struct sockaddr_ll *)&he)->sll_addr, -1, ((struct sockaddr_ll *)&he)->sll_halen);
|
||||||
|
+ memset(he->sll_addr, -1, he->sll_halen);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (!quiet) {
|
||||||
|
--- Makefile
|
||||||
|
+++ Makefile
|
||||||
|
@@ -28,7 +28,6 @@
|
||||||
|
ping6: LDLIBS += -lidn
|
||||||
|
endif
|
||||||
|
|
||||||
|
-arping: LDLIBS += -lsysfs
|
||||||
|
ping6: LDLIBS += -lresolv -lcrypto
|
||||||
|
|
||||||
|
tftpd: tftpd.o tftpsubs.o
|
||||||
@ -0,0 +1,55 @@
|
|||||||
|
--- rarpd.c
|
||||||
|
+++ rarpd.c
|
||||||
|
@@ -55,10 +55,10 @@ struct iflink
|
||||||
|
unsigned char lladdr[16];
|
||||||
|
char name[IFNAMSIZ];
|
||||||
|
- struct ifaddr *ifa_list;
|
||||||
|
+ struct kern_ifaddr *ifa_list;
|
||||||
|
} *ifl_list;
|
||||||
|
|
||||||
|
-struct ifaddr
|
||||||
|
+struct kern_ifaddr
|
||||||
|
{
|
||||||
|
- struct ifaddr *next;
|
||||||
|
+ struct kern_ifaddr *next;
|
||||||
|
__u32 prefix;
|
||||||
|
__u32 mask;
|
||||||
|
@@ -92,5 +92,5 @@ void load_if(void)
|
||||||
|
struct ifreq *ifrp, *ifend;
|
||||||
|
struct iflink *ifl;
|
||||||
|
- struct ifaddr *ifa;
|
||||||
|
+ struct kern_ifaddr *ifa;
|
||||||
|
struct ifconf ifc;
|
||||||
|
struct ifreq ibuf[256];
|
||||||
|
@@ -183,5 +183,5 @@ void load_if(void)
|
||||||
|
if (mask == 0 || prefix == 0)
|
||||||
|
continue;
|
||||||
|
- ifa = (struct ifaddr*)malloc(sizeof(*ifa));
|
||||||
|
+ ifa = (struct kern_ifaddr*)malloc(sizeof(*ifa));
|
||||||
|
memset(ifa, 0, sizeof(*ifa));
|
||||||
|
ifa->local = addr;
|
||||||
|
@@ -239,8 +239,8 @@ int bootable(__u32 addr)
|
||||||
|
}
|
||||||
|
|
||||||
|
-struct ifaddr *select_ipaddr(int ifindex, __u32 *sel_addr, __u32 **alist)
|
||||||
|
+struct kern_ifaddr *select_ipaddr(int ifindex, __u32 *sel_addr, __u32 **alist)
|
||||||
|
{
|
||||||
|
struct iflink *ifl;
|
||||||
|
- struct ifaddr *ifa;
|
||||||
|
+ struct kern_ifaddr *ifa;
|
||||||
|
int retry = 0;
|
||||||
|
int i;
|
||||||
|
@@ -298,5 +298,5 @@ struct rarp_map *rarp_lookup(int ifindex
|
||||||
|
if (r == NULL) {
|
||||||
|
if (hatype == ARPHRD_ETHER && halen == 6) {
|
||||||
|
- struct ifaddr *ifa;
|
||||||
|
+ struct kern_ifaddr *ifa;
|
||||||
|
struct hostent *hp;
|
||||||
|
char ename[256];
|
||||||
|
@@ -371,5 +371,5 @@ int put_myipaddr(unsigned char **ptr_p,
|
||||||
|
__u32 laddr = 0;
|
||||||
|
struct iflink *ifl;
|
||||||
|
- struct ifaddr *ifa;
|
||||||
|
+ struct kern_ifaddr *ifa;
|
||||||
|
|
||||||
|
for (ifl=ifl_list; ifl; ifl = ifl->next)
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
--- iputils-s20071127/ping_common.h.orig 2008-06-10 11:16:06.000000000 +0100
|
||||||
|
+++ iputils-s20071127/ping_common.h 2008-06-10 11:16:18.000000000 +0100
|
||||||
|
@@ -28,7 +28,7 @@
|
||||||
|
|
||||||
|
#define MAXWAIT 10 /* max seconds to wait for response */
|
||||||
|
#define MININTERVAL 10 /* Minimal interpacket gap */
|
||||||
|
-#define MINUSERINTERVAL 200 /* Minimal allowed interval for non-root */
|
||||||
|
+#define MINUSERINTERVAL 0 /* Minimal allowed interval for non-root */
|
||||||
|
|
||||||
|
#define SCHINT(a) (((a) <= MININTERVAL) ? MININTERVAL : (a))
|
||||||
|
|
||||||
@ -0,0 +1,93 @@
|
|||||||
|
From f36fbe8c85223def663f46499d0b6b9a75939aaa Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mike Frysinger <vapier@gentoo.org>
|
||||||
|
Date: Sat, 14 Aug 2010 01:34:13 -0400
|
||||||
|
Subject: [PATCH] fix up strict-aliasing warnings
|
||||||
|
|
||||||
|
Current build of some tools results in gcc warning about strict-aliasing
|
||||||
|
violations. So change those freaky casts to memcpy's. When the pointer
|
||||||
|
types work out, gcc will optimize this away anyways.
|
||||||
|
|
||||||
|
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
||||||
|
---
|
||||||
|
ping6.c | 13 +++++++++----
|
||||||
|
tracepath.c | 2 +-
|
||||||
|
tracepath6.c | 2 +-
|
||||||
|
3 files changed, 11 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/ping6.c b/ping6.c
|
||||||
|
index c5ff881..86f9216 100644
|
||||||
|
--- a/ping6.c
|
||||||
|
+++ b/ping6.c
|
||||||
|
@@ -1104,18 +1104,21 @@ int build_niquery(__u8 *_nih)
|
||||||
|
{
|
||||||
|
struct ni_hdr *nih;
|
||||||
|
int cc;
|
||||||
|
+ __u16 this_nonce;
|
||||||
|
|
||||||
|
nih = (struct ni_hdr *)_nih;
|
||||||
|
nih->ni_cksum = 0;
|
||||||
|
|
||||||
|
- CLR(ntohs((*(__u16*)(nih->ni_nonce))) % mx_dup_ck);
|
||||||
|
+ memcpy(&this_nonce, &nih->ni_nonce, sizeof(this_nonce));
|
||||||
|
+ CLR(ntohs(this_nonce) % mx_dup_ck);
|
||||||
|
|
||||||
|
nih->ni_type = ICMPV6_NI_QUERY;
|
||||||
|
cc = sizeof(*nih);
|
||||||
|
datalen = 0;
|
||||||
|
|
||||||
|
memcpy(nih->ni_nonce, ni_nonce, sizeof(nih->ni_nonce));
|
||||||
|
- *(__u16*)(nih->ni_nonce) = htons(ntransmitted + 1);
|
||||||
|
+ this_nonce = htons(ntransmitted + 1);
|
||||||
|
+ memcpy(&nih->ni_nonce, &this_nonce, sizeof(this_nonce));
|
||||||
|
|
||||||
|
nih->ni_code = ni_subject_type;
|
||||||
|
nih->ni_qtype = htons(ni_query);
|
||||||
|
@@ -1331,7 +1334,7 @@ parse_reply(struct msghdr *msg, int cc, void *addr, struct timeval *tv)
|
||||||
|
#endif
|
||||||
|
if (c->cmsg_len < CMSG_LEN(sizeof(int)))
|
||||||
|
continue;
|
||||||
|
- hops = *(int*)CMSG_DATA(c);
|
||||||
|
+ memcpy(&hops, CMSG_DATA(c), sizeof(int));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1355,7 +1358,9 @@ parse_reply(struct msghdr *msg, int cc, void *addr, struct timeval *tv)
|
||||||
|
return 0;
|
||||||
|
} else if (icmph->icmp6_type == ICMPV6_NI_REPLY) {
|
||||||
|
struct ni_hdr *nih = (struct ni_hdr *)icmph;
|
||||||
|
- __u16 seq = ntohs(*(__u16 *)nih->ni_nonce);
|
||||||
|
+ __u16 seq;
|
||||||
|
+ memcpy(&seq, &nih->ni_nonce, sizeof(seq));
|
||||||
|
+ seq = ntohs(seq);
|
||||||
|
if (memcmp(&nih->ni_nonce[2], &ni_nonce[2], sizeof(ni_nonce) - sizeof(__u16)))
|
||||||
|
return 1;
|
||||||
|
if (gather_statistics((__u8*)icmph, sizeof(*icmph), cc,
|
||||||
|
diff --git a/tracepath.c b/tracepath.c
|
||||||
|
index ca84a69..0a14b1b 100644
|
||||||
|
--- a/tracepath.c
|
||||||
|
+++ b/tracepath.c
|
||||||
|
@@ -142,7 +142,7 @@ restart:
|
||||||
|
if (cmsg->cmsg_type == IP_RECVERR) {
|
||||||
|
e = (struct sock_extended_err *) CMSG_DATA(cmsg);
|
||||||
|
} else if (cmsg->cmsg_type == IP_TTL) {
|
||||||
|
- rethops = *(int*)CMSG_DATA(cmsg);
|
||||||
|
+ memcpy(&rethops, CMSG_DATA(cmsg), sizeof(int));
|
||||||
|
} else {
|
||||||
|
printf("cmsg:%d\n ", cmsg->cmsg_type);
|
||||||
|
}
|
||||||
|
diff --git a/tracepath6.c b/tracepath6.c
|
||||||
|
index 5c2db8f..77a3563 100644
|
||||||
|
--- a/tracepath6.c
|
||||||
|
+++ b/tracepath6.c
|
||||||
|
@@ -170,7 +170,7 @@ restart:
|
||||||
|
#ifdef IPV6_2292HOPLIMIT
|
||||||
|
case IPV6_2292HOPLIMIT:
|
||||||
|
#endif
|
||||||
|
- rethops = *(int*)CMSG_DATA(cmsg);
|
||||||
|
+ memcpy(&rethops, CMSG_DATA(cmsg), sizeof(int));
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
printf("cmsg6:%d\n ", cmsg->cmsg_type);
|
||||||
|
--
|
||||||
|
1.7.1.1
|
||||||
|
|
||||||
@ -0,0 +1,50 @@
|
|||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -0,0 +1,35 @@
|
|||||||
|
--- 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=
|
||||||
|
-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:
|
||||||
@ -0,0 +1,35 @@
|
|||||||
|
make openssl optional
|
||||||
|
|
||||||
|
https://bugs.gentoo.org/335436
|
||||||
|
|
||||||
|
--- ping6.c
|
||||||
|
+++ ping6.c
|
||||||
|
@@ -161,7 +161,9 @@
|
||||||
|
|
||||||
|
static int icmp_sock;
|
||||||
|
|
||||||
|
+#ifdef HAVE_OPENSSL
|
||||||
|
#include <openssl/md5.h>
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/* Node Information query */
|
||||||
|
int ni_query = -1;
|
||||||
|
@@ -478,6 +480,7 @@
|
||||||
|
|
||||||
|
char *ni_groupaddr(const char *name)
|
||||||
|
{
|
||||||
|
+#ifdef HAVE_OPENSSL
|
||||||
|
MD5_CTX ctxt;
|
||||||
|
__u8 digest[16];
|
||||||
|
static char nigroup_buf[INET6_ADDRSTRLEN + 1 + IFNAMSIZ];
|
||||||
|
@@ -518,6 +521,10 @@
|
||||||
|
if (q)
|
||||||
|
strcat(nigroup_buf, q);
|
||||||
|
return nigroup_buf;
|
||||||
|
+#else
|
||||||
|
+ fprintf(stderr, "ping6: function not available; openssl disabled\n");
|
||||||
|
+ exit(1);
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
int main(int argc, char *argv[])
|
||||||
@ -0,0 +1,22 @@
|
|||||||
|
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++;
|
||||||
@ -0,0 +1,62 @@
|
|||||||
|
From 6ccd3b91c18d8b13bc468ef962a9ef9dfc6c4515 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mike Frysinger <vapier@gentoo.org>
|
||||||
|
Date: Sat, 14 Aug 2010 01:16:42 -0400
|
||||||
|
Subject: [PATCH] tracepath: re-use printf return in print_host
|
||||||
|
|
||||||
|
The printf funcs take an int for field widths, not a size_t. Also, since
|
||||||
|
the printf funcs already return the length of chars displayed, use that
|
||||||
|
value instead of re-calculating the length with strlen.
|
||||||
|
|
||||||
|
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
||||||
|
---
|
||||||
|
tracepath.c | 11 ++++-------
|
||||||
|
tracepath6.c | 11 ++++-------
|
||||||
|
2 files changed, 8 insertions(+), 14 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tracepath.c b/tracepath.c
|
||||||
|
index 81c22e9..ca84a69 100644
|
||||||
|
--- a/tracepath.c
|
||||||
|
+++ b/tracepath.c
|
||||||
|
@@ -68,13 +68,10 @@ void data_wait(int fd)
|
||||||
|
|
||||||
|
void print_host(const char *a, const char *b, int both)
|
||||||
|
{
|
||||||
|
- size_t plen = 0;
|
||||||
|
- printf("%s", a);
|
||||||
|
- plen = strlen(a);
|
||||||
|
- if (both) {
|
||||||
|
- printf(" (%s)", b);
|
||||||
|
- plen += strlen(b) + 3;
|
||||||
|
- }
|
||||||
|
+ int plen;
|
||||||
|
+ plen = printf("%s", a);
|
||||||
|
+ if (both)
|
||||||
|
+ plen += printf(" (%s)", b);
|
||||||
|
if (plen >= HOST_COLUMN_SIZE)
|
||||||
|
plen = HOST_COLUMN_SIZE - 1;
|
||||||
|
printf("%*s", HOST_COLUMN_SIZE - plen, "");
|
||||||
|
diff --git a/tracepath6.c b/tracepath6.c
|
||||||
|
index 5cc7424..5c2db8f 100644
|
||||||
|
--- a/tracepath6.c
|
||||||
|
+++ b/tracepath6.c
|
||||||
|
@@ -80,13 +80,10 @@ void data_wait(int fd)
|
||||||
|
|
||||||
|
void print_host(const char *a, const char *b, int both)
|
||||||
|
{
|
||||||
|
- size_t plen = 0;
|
||||||
|
- printf("%s", a);
|
||||||
|
- plen = strlen(a);
|
||||||
|
- if (both) {
|
||||||
|
- printf(" (%s)", b);
|
||||||
|
- plen += strlen(b) + 3;
|
||||||
|
- }
|
||||||
|
+ int plen;
|
||||||
|
+ plen = printf("%s", a);
|
||||||
|
+ if (both)
|
||||||
|
+ plen += printf(" (%s)", b);
|
||||||
|
if (plen >= HOST_COLUMN_SIZE)
|
||||||
|
plen = HOST_COLUMN_SIZE - 1;
|
||||||
|
printf("%*s", HOST_COLUMN_SIZE - plen, "");
|
||||||
|
--
|
||||||
|
1.7.1.1
|
||||||
|
|
||||||
@ -0,0 +1,20 @@
|
|||||||
|
http://bugs.gentoo.org/332703
|
||||||
|
|
||||||
|
--- Makefile
|
||||||
|
+++ Makefile
|
||||||
|
@@ -28,10 +28,13 @@
|
||||||
|
ping6: LDLIBS += -lidn
|
||||||
|
endif
|
||||||
|
|
||||||
|
+arping: LDLIBS += -lsysfs
|
||||||
|
+ping6: LDLIBS += -lresolv -lcrypto
|
||||||
|
+
|
||||||
|
tftpd: tftpd.o tftpsubs.o
|
||||||
|
-arping: arping.o -lsysfs
|
||||||
|
+arping: arping.o
|
||||||
|
ping: ping.o ping_common.o
|
||||||
|
-ping6: ping6.o ping_common.o -lresolv -lcrypto
|
||||||
|
+ping6: ping6.o ping_common.o
|
||||||
|
ping.o ping6.o ping_common.o: ping_common.h
|
||||||
|
tftpd.o tftpsubs.o: tftp.h
|
||||||
|
|
||||||
@ -0,0 +1,22 @@
|
|||||||
|
https://bugs.gentoo.org/335347
|
||||||
|
|
||||||
|
fix building with older linux headers that don't define SO_MARK
|
||||||
|
|
||||||
|
--- ping_common.c
|
||||||
|
+++ ping_common.c
|
||||||
|
@@ -485,6 +485,7 @@
|
||||||
|
fprintf(stderr, "Warning: no SO_TIMESTAMP support, falling back to SIOCGSTAMP\n");
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
+#ifdef SO_MARK
|
||||||
|
if (options & F_MARK) {
|
||||||
|
if (setsockopt(icmp_sock, SOL_SOCKET, SO_MARK,
|
||||||
|
&mark, sizeof(mark)) == -1) {
|
||||||
|
@@ -494,6 +495,7 @@
|
||||||
|
fprintf(stderr, "Warning: Failed to set mark %d\n", mark);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/* Set some SNDTIMEO to prevent blocking forever
|
||||||
|
* on sends, when device is too slow or stalls. Just put limit
|
||||||
@ -0,0 +1,224 @@
|
|||||||
|
http://openwall.info/wiki/people/segoon/ping
|
||||||
|
|
||||||
|
--- iputils-s20101006/ping.c
|
||||||
|
+++ iputils-s20101006/ping.c
|
||||||
|
@@ -88,6 +88,7 @@ struct sockaddr_in whereto; /* who to pi
|
||||||
|
int optlen = 0;
|
||||||
|
int settos = 0; /* Set TOS, Precendence or other QOS options */
|
||||||
|
int icmp_sock; /* socket file descriptor */
|
||||||
|
+int using_ping_socket = 0;
|
||||||
|
u_char outpack[0x10000];
|
||||||
|
int maxpacket = sizeof(outpack);
|
||||||
|
|
||||||
|
@@ -123,7 +124,11 @@ main(int argc, char **argv)
|
||||||
|
char *target, hnamebuf[MAX_HOSTNAMELEN];
|
||||||
|
char rspace[3 + 4 * NROUTES + 1]; /* record route space */
|
||||||
|
|
||||||
|
- icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
|
||||||
|
+ icmp_sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_ICMP);
|
||||||
|
+ if (icmp_sock != -1)
|
||||||
|
+ using_ping_socket = 1;
|
||||||
|
+ else
|
||||||
|
+ icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
|
||||||
|
socket_errno = errno;
|
||||||
|
|
||||||
|
uid = getuid();
|
||||||
|
@@ -377,13 +382,35 @@ main(int argc, char **argv)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- if ((options&F_STRICTSOURCE) &&
|
||||||
|
- bind(icmp_sock, (struct sockaddr*)&source, sizeof(source)) == -1) {
|
||||||
|
- perror("bind");
|
||||||
|
- exit(2);
|
||||||
|
+ if (!using_ping_socket) {
|
||||||
|
+ if ((options&F_STRICTSOURCE) &&
|
||||||
|
+ bind(icmp_sock, (struct sockaddr*)&source, sizeof(source)) == -1) {
|
||||||
|
+ perror("bind");
|
||||||
|
+ exit(2);
|
||||||
|
+ }
|
||||||
|
+ } else {
|
||||||
|
+ struct sockaddr_in sa;
|
||||||
|
+ socklen_t sl;
|
||||||
|
+
|
||||||
|
+ sa.sin_family = AF_INET;
|
||||||
|
+ sa.sin_port = 0;
|
||||||
|
+ sa.sin_addr.s_addr = (options&F_STRICTSOURCE) ?
|
||||||
|
+ source.sin_addr.s_addr : 0;
|
||||||
|
+ sl = sizeof(sa);
|
||||||
|
+
|
||||||
|
+ if (bind(icmp_sock, (struct sockaddr *) &sa, sl) == -1) {
|
||||||
|
+ perror("bind");
|
||||||
|
+ exit(2);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (getsockname(icmp_sock, (struct sockaddr *) &sa, &sl) == -1) {
|
||||||
|
+ perror("getsockname");
|
||||||
|
+ exit(2);
|
||||||
|
+ }
|
||||||
|
+ ident = sa.sin_port;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (1) {
|
||||||
|
+ if (!using_ping_socket) {
|
||||||
|
struct icmp_filter filt;
|
||||||
|
filt.data = ~((1<<ICMP_SOURCE_QUENCH)|
|
||||||
|
(1<<ICMP_DEST_UNREACH)|
|
||||||
|
@@ -398,6 +425,12 @@ main(int argc, char **argv)
|
||||||
|
hold = 1;
|
||||||
|
if (setsockopt(icmp_sock, SOL_IP, IP_RECVERR, (char *)&hold, sizeof(hold)))
|
||||||
|
fprintf(stderr, "WARNING: your kernel is veeery old. No problems.\n");
|
||||||
|
+ if (using_ping_socket) {
|
||||||
|
+ if (setsockopt(icmp_sock, SOL_IP, IP_RECVTTL, (char *)&hold, sizeof(hold)))
|
||||||
|
+ perror("WARNING: setsockopt(IP_RECVTTL)");
|
||||||
|
+ if (setsockopt(icmp_sock, SOL_IP, IP_RETOPTS, (char *)&hold, sizeof(hold)))
|
||||||
|
+ perror("WARNING: setsockopt(IP_RETOPTS)");
|
||||||
|
+ }
|
||||||
|
|
||||||
|
/* record route option */
|
||||||
|
if (options & F_RROUTE) {
|
||||||
|
@@ -566,6 +599,7 @@ int receive_error_msg()
|
||||||
|
nerrors++;
|
||||||
|
} else if (e->ee_origin == SO_EE_ORIGIN_ICMP) {
|
||||||
|
struct sockaddr_in *sin = (struct sockaddr_in*)(e+1);
|
||||||
|
+ int error_pkt;
|
||||||
|
|
||||||
|
if (res < sizeof(icmph) ||
|
||||||
|
target.sin_addr.s_addr != whereto.sin_addr.s_addr ||
|
||||||
|
@@ -576,9 +610,18 @@ int receive_error_msg()
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
|
- acknowledge(ntohs(icmph.un.echo.sequence));
|
||||||
|
+ error_pkt = (e->ee_type != ICMP_REDIRECT &&
|
||||||
|
+ e->ee_type != ICMP_SOURCE_QUENCH);
|
||||||
|
+ if (error_pkt) {
|
||||||
|
+ acknowledge(ntohs(icmph.un.echo.sequence));
|
||||||
|
+ net_errors++;
|
||||||
|
+ nerrors++;
|
||||||
|
+ }
|
||||||
|
+ else {
|
||||||
|
+ saved_errno = 0;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
- if (!working_recverr) {
|
||||||
|
+ if (!using_ping_socket && !working_recverr) {
|
||||||
|
struct icmp_filter filt;
|
||||||
|
working_recverr = 1;
|
||||||
|
/* OK, it works. Add stronger filter. */
|
||||||
|
@@ -589,15 +632,14 @@ int receive_error_msg()
|
||||||
|
perror("\rWARNING: setsockopt(ICMP_FILTER)");
|
||||||
|
}
|
||||||
|
|
||||||
|
- net_errors++;
|
||||||
|
- nerrors++;
|
||||||
|
if (options & F_QUIET)
|
||||||
|
goto out;
|
||||||
|
if (options & F_FLOOD) {
|
||||||
|
- write(STDOUT_FILENO, "\bE", 2);
|
||||||
|
+ if (error_pkt)
|
||||||
|
+ write(STDOUT_FILENO, "\bE", 2);
|
||||||
|
} else {
|
||||||
|
print_timestamp();
|
||||||
|
- printf("From %s icmp_seq=%u ", pr_addr(sin->sin_addr.s_addr), ntohs(icmph.un.echo.sequence));
|
||||||
|
+ printf("From %s: icmp_seq=%u ", pr_addr(sin->sin_addr.s_addr), ntohs(icmph.un.echo.sequence));
|
||||||
|
pr_icmph(e->ee_type, e->ee_code, e->ee_info, NULL);
|
||||||
|
fflush(stdout);
|
||||||
|
}
|
||||||
|
@@ -695,15 +737,41 @@ parse_reply(struct msghdr *msg, int cc,
|
||||||
|
struct iphdr *ip;
|
||||||
|
int hlen;
|
||||||
|
int csfailed;
|
||||||
|
+ struct cmsghdr *cmsg;
|
||||||
|
+ int ttl;
|
||||||
|
+ __u8 *opts;
|
||||||
|
+ int optlen;
|
||||||
|
|
||||||
|
/* Check the IP header */
|
||||||
|
ip = (struct iphdr *)buf;
|
||||||
|
- hlen = ip->ihl*4;
|
||||||
|
- if (cc < hlen + 8 || ip->ihl < 5) {
|
||||||
|
- if (options & F_VERBOSE)
|
||||||
|
- fprintf(stderr, "ping: packet too short (%d bytes) from %s\n", cc,
|
||||||
|
- pr_addr(from->sin_addr.s_addr));
|
||||||
|
- return 1;
|
||||||
|
+ if (!using_ping_socket) {
|
||||||
|
+ hlen = ip->ihl*4;
|
||||||
|
+ if (cc < hlen + 8 || ip->ihl < 5) {
|
||||||
|
+ if (options & F_VERBOSE)
|
||||||
|
+ fprintf(stderr, "ping: packet too short (%d bytes) from %s\n", cc,
|
||||||
|
+ pr_addr(from->sin_addr.s_addr));
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
+ ttl = ip->ttl;
|
||||||
|
+ opts = buf + sizeof(struct iphdr);
|
||||||
|
+ optlen = hlen - sizeof(struct iphdr);
|
||||||
|
+ } else {
|
||||||
|
+ hlen = 0;
|
||||||
|
+ ttl = 0;
|
||||||
|
+ opts = buf;
|
||||||
|
+ optlen = 0;
|
||||||
|
+ for (cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg)) {
|
||||||
|
+ if (cmsg->cmsg_level != SOL_IP)
|
||||||
|
+ continue;
|
||||||
|
+ if (cmsg->cmsg_type == IP_TTL) {
|
||||||
|
+ if (cmsg->cmsg_len < sizeof(int))
|
||||||
|
+ continue;
|
||||||
|
+ ttl = *(int *) CMSG_DATA(cmsg);
|
||||||
|
+ } else if (cmsg->cmsg_type == IP_RETOPTS) {
|
||||||
|
+ opts = (__u8 *) CMSG_DATA(cmsg);
|
||||||
|
+ optlen = cmsg->cmsg_len;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Now the ICMP part */
|
||||||
|
@@ -716,7 +784,7 @@ parse_reply(struct msghdr *msg, int cc,
|
||||||
|
return 1; /* 'Twas not our ECHO */
|
||||||
|
if (gather_statistics((__u8*)icp, sizeof(*icp), cc,
|
||||||
|
ntohs(icp->un.echo.sequence),
|
||||||
|
- ip->ttl, 0, tv, pr_addr(from->sin_addr.s_addr),
|
||||||
|
+ ttl, 0, tv, pr_addr(from->sin_addr.s_addr),
|
||||||
|
pr_echo_reply))
|
||||||
|
return 0;
|
||||||
|
} else {
|
||||||
|
@@ -807,7 +875,7 @@ parse_reply(struct msghdr *msg, int cc,
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!(options & F_FLOOD)) {
|
||||||
|
- pr_options(buf + sizeof(struct iphdr), hlen);
|
||||||
|
+ pr_options(opts, optlen + sizeof(struct iphdr));
|
||||||
|
|
||||||
|
if (options & F_AUDIBLE)
|
||||||
|
putchar('\a');
|
||||||
|
@@ -916,8 +984,7 @@ void pr_icmph(__u8 type, __u8 code, __u3
|
||||||
|
printf("Redirect, Bad Code: %d", code);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
- if (icp)
|
||||||
|
- printf("(New nexthop: %s)\n", pr_addr(icp->un.gateway));
|
||||||
|
+ printf("(New nexthop: %s)\n", pr_addr(icp ? icp->un.gateway : info));
|
||||||
|
if (icp && (options & F_VERBOSE))
|
||||||
|
pr_iph((struct iphdr*)(icp + 1));
|
||||||
|
break;
|
||||||
|
@@ -1217,7 +1284,7 @@ void install_filter(void)
|
||||||
|
insns
|
||||||
|
};
|
||||||
|
|
||||||
|
- if (once)
|
||||||
|
+ if (once || using_ping_socket)
|
||||||
|
return;
|
||||||
|
once = 1;
|
||||||
|
|
||||||
|
--- iputils-s20101006/ping_common.c
|
||||||
|
+++ iputils-s20101006/ping_common.c
|
||||||
|
@@ -515,7 +515,8 @@ void setup(int icmp_sock)
|
||||||
|
*p++ = i;
|
||||||
|
}
|
||||||
|
|
||||||
|
- ident = htons(getpid() & 0xFFFF);
|
||||||
|
+ if (!ident)
|
||||||
|
+ ident = htons(getpid() & 0xFFFF);
|
||||||
|
|
||||||
|
set_signal(SIGINT, sigexit);
|
||||||
|
set_signal(SIGALRM, sigexit);
|
||||||
@ -0,0 +1,35 @@
|
|||||||
|
From 568e990d30fc7e9416e0a6f8c74ea5013921eaec Mon Sep 17 00:00:00 2001
|
||||||
|
From: Arjan van de Ven <arjanvandeven@gmail.com>
|
||||||
|
Date: Wed, 16 Jan 2013 03:12:15 +0900
|
||||||
|
Subject: [PATCH [iputils]] ping6: Fix build command line argument with gnutls.
|
||||||
|
|
||||||
|
The ping6 command can use either openssl or gnutls...
|
||||||
|
and the Makefile has a bunch of setup for defining which of the two to use.
|
||||||
|
|
||||||
|
Unfortunately, the final -D define on the commandline to enable gnutls
|
||||||
|
inside the ping6.c file didn't actually make it onto the gcc
|
||||||
|
commandline.
|
||||||
|
This patch adds the $(DEF_CRYPTO) Makefile variable to fix this gap.
|
||||||
|
|
||||||
|
Signed-off-by: Arjan van de Ven <arjanvandeven@gmail.com>
|
||||||
|
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
|
||||||
|
---
|
||||||
|
Makefile | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile b/Makefile
|
||||||
|
index c62d9df..89249f5 100644
|
||||||
|
--- a/Makefile
|
||||||
|
+++ b/Makefile
|
||||||
|
@@ -149,7 +149,7 @@ LIB_clockdiff = $(LIB_CAP)
|
||||||
|
DEF_ping_common = $(DEF_CAP) $(DEF_IDN)
|
||||||
|
DEF_ping = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS)
|
||||||
|
LIB_ping = $(LIB_CAP) $(LIB_IDN)
|
||||||
|
-DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR)
|
||||||
|
+DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR) $(DEF_CRYPTO)
|
||||||
|
LIB_ping6 = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV) $(LIB_CRYPTO)
|
||||||
|
|
||||||
|
ping: ping_common.o
|
||||||
|
--
|
||||||
|
1.8.0.2
|
||||||
|
|
||||||
@ -0,0 +1,61 @@
|
|||||||
|
From c66609d2c830d6fe06f48f5d38c54eb5cc6f2975 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mike Frysinger <vapier@gentoo.org>
|
||||||
|
Date: Thu, 24 Jan 2013 23:36:16 -0500
|
||||||
|
Subject: [PATCH [iputils]] fix handling of CFLAGS
|
||||||
|
|
||||||
|
This defaults CFLAGS to -O3 without clobbering settings people have set
|
||||||
|
up in the environment already.
|
||||||
|
|
||||||
|
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
||||||
|
---
|
||||||
|
Makefile | 13 +++++--------
|
||||||
|
1 file changed, 5 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile b/Makefile
|
||||||
|
index 2c49940..ecabac3 100644
|
||||||
|
--- a/Makefile
|
||||||
|
+++ b/Makefile
|
||||||
|
@@ -2,8 +2,6 @@
|
||||||
|
# Configuration
|
||||||
|
#
|
||||||
|
|
||||||
|
-# CC
|
||||||
|
-CC=gcc
|
||||||
|
# Path to parent kernel include files directory
|
||||||
|
LIBC_INCLUDE=/usr/include
|
||||||
|
# Libraries
|
||||||
|
@@ -48,11 +46,10 @@ ENABLE_RDISC_SERVER=no
|
||||||
|
|
||||||
|
# -------------------------------------
|
||||||
|
# What a pity, all new gccs are buggy and -Werror does not work. Sigh.
|
||||||
|
-# CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g
|
||||||
|
-CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -g
|
||||||
|
-CCOPTOPT=-O3
|
||||||
|
-GLIBCFIX=-D_GNU_SOURCE
|
||||||
|
-DEFINES=
|
||||||
|
+# CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g
|
||||||
|
+CFLAGS?=-O3 -g
|
||||||
|
+CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall
|
||||||
|
+CPPFLAGS+=-D_GNU_SOURCE
|
||||||
|
LDLIB=
|
||||||
|
|
||||||
|
FUNC_LIB = $(if $(filter static,$(1)),$(LDFLAG_STATIC) $(2) $(LDFLAG_DYNAMIC),$(2))
|
||||||
|
@@ -113,7 +110,6 @@ IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
|
||||||
|
IPV6_TARGETS=tracepath6 traceroute6 ping6
|
||||||
|
TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
|
||||||
|
|
||||||
|
-CFLAGS=$(CCOPTOPT) $(CCOPT) $(GLIBCFIX) $(DEFINES)
|
||||||
|
LDLIBS=$(LDLIB) $(ADDLIB)
|
||||||
|
|
||||||
|
UNAME_N:=$(shell uname -n)
|
||||||
|
@@ -132,6 +128,7 @@ all: $(TARGETS)
|
||||||
|
$(COMPILE.c) $< $(DEF_$(patsubst %.o,%,$@)) -S -o $@
|
||||||
|
%.o: %.c
|
||||||
|
$(COMPILE.c) $< $(DEF_$(patsubst %.o,%,$@)) -o $@
|
||||||
|
+LINK.o += $(CFLAGS)
|
||||||
|
$(TARGETS): %: %.o
|
||||||
|
$(LINK.o) $^ $(LIB_$@) $(LDLIBS) -o $@
|
||||||
|
|
||||||
|
--
|
||||||
|
1.8.0.2
|
||||||
|
|
||||||
@ -0,0 +1,92 @@
|
|||||||
|
From b57d77dcfa5cb363b7eba5b331324669a8505ac4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mike Frysinger <vapier@gentoo.org>
|
||||||
|
Date: Thu, 24 Jan 2013 23:32:39 -0500
|
||||||
|
Subject: [PATCH [iputils]] ping6: allow disabling of openssl support
|
||||||
|
|
||||||
|
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
||||||
|
---
|
||||||
|
Makefile | 5 ++++-
|
||||||
|
ping6.c | 14 +++++++++++++-
|
||||||
|
2 files changed, 17 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile b/Makefile
|
||||||
|
index 89249f5..2c49940 100644
|
||||||
|
--- a/Makefile
|
||||||
|
+++ b/Makefile
|
||||||
|
@@ -36,7 +36,7 @@ ARPING_DEFAULT_DEVICE=
|
||||||
|
|
||||||
|
# GNU TLS library for ping6 [yes|no|static]
|
||||||
|
USE_GNUTLS=yes
|
||||||
|
-# Crypto library for ping6 [shared|static]
|
||||||
|
+# Crypto library for ping6 [shared|static|no]
|
||||||
|
USE_CRYPTO=shared
|
||||||
|
# Resolv library for ping6 [yes|static]
|
||||||
|
USE_RESOLV=yes
|
||||||
|
@@ -63,7 +63,10 @@ ifneq ($(USE_GNUTLS),no)
|
||||||
|
LIB_CRYPTO = $(call FUNC_LIB,$(USE_GNUTLS),$(LDFLAG_GNUTLS))
|
||||||
|
DEF_CRYPTO = -DUSE_GNUTLS
|
||||||
|
else
|
||||||
|
+ifneq ($(USE_CRYPTO),no)
|
||||||
|
LIB_CRYPTO = $(call FUNC_LIB,$(USE_CRYPTO),$(LDFLAG_CRYPTO))
|
||||||
|
+ DEF_CRYPTO = -DUSE_OPENSSL
|
||||||
|
+endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
# USE_RESOLV: LIB_RESOLV
|
||||||
|
diff --git a/ping6.c b/ping6.c
|
||||||
|
index c39864d..f2f90af 100644
|
||||||
|
--- a/ping6.c
|
||||||
|
+++ b/ping6.c
|
||||||
|
@@ -168,8 +168,10 @@ static int icmp_sock;
|
||||||
|
|
||||||
|
#ifdef USE_GNUTLS
|
||||||
|
# include <gnutls/openssl.h>
|
||||||
|
-#else
|
||||||
|
+# define USE_CRYPTO
|
||||||
|
+#elif defined USE_OPENSSL
|
||||||
|
# include <openssl/md5.h>
|
||||||
|
+# define USE_CRYPTO
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Node Information query */
|
||||||
|
@@ -326,6 +328,7 @@ static void niquery_init_nonce(void)
|
||||||
|
#if !PING6_NONCE_MEMORY
|
||||||
|
static int niquery_nonce(__u8 *nonce, int fill)
|
||||||
|
{
|
||||||
|
+# ifdef USE_CRYPTO
|
||||||
|
static __u8 digest[MD5_DIGEST_LENGTH];
|
||||||
|
static int seq = -1;
|
||||||
|
|
||||||
|
@@ -348,6 +351,10 @@ static int niquery_nonce(__u8 *nonce, int fill)
|
||||||
|
return -1;
|
||||||
|
return ntohsp((__u16 *)nonce);
|
||||||
|
}
|
||||||
|
+# else
|
||||||
|
+ fprintf(stderr, "ping6: function not available; crypto disabled\n");
|
||||||
|
+ exit(3);
|
||||||
|
+# endif
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
@@ -502,6 +509,7 @@ static int niquery_option_subject_addr_handler(int index, const char *arg)
|
||||||
|
|
||||||
|
static int niquery_option_subject_name_handler(int index, const char *arg)
|
||||||
|
{
|
||||||
|
+#ifdef USE_CRYPTO
|
||||||
|
static char nigroup_buf[INET6_ADDRSTRLEN + 1 + IFNAMSIZ];
|
||||||
|
unsigned char *dnptrs[2], **dpp, **lastdnptr;
|
||||||
|
int n;
|
||||||
|
@@ -627,6 +635,10 @@ errexit:
|
||||||
|
free(idn);
|
||||||
|
free(name);
|
||||||
|
exit(1);
|
||||||
|
+#else
|
||||||
|
+ fprintf(stderr, "ping6: function not available; crypto disabled\n");
|
||||||
|
+ exit(3);
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
int niquery_option_help_handler(int index, const char *arg)
|
||||||
|
--
|
||||||
|
1.8.0.2
|
||||||
|
|
||||||
@ -0,0 +1,224 @@
|
|||||||
|
http://openwall.info/wiki/people/segoon/ping
|
||||||
|
|
||||||
|
--- iputils-s20101006/ping.c
|
||||||
|
+++ iputils-s20101006/ping.c
|
||||||
|
@@ -88,6 +88,7 @@ struct sockaddr_in whereto; /* who to pi
|
||||||
|
int optlen = 0;
|
||||||
|
int settos = 0; /* Set TOS, Precendence or other QOS options */
|
||||||
|
int icmp_sock; /* socket file descriptor */
|
||||||
|
+int using_ping_socket = 0;
|
||||||
|
u_char outpack[0x10000];
|
||||||
|
int maxpacket = sizeof(outpack);
|
||||||
|
|
||||||
|
@@ -123,7 +124,11 @@ main(int argc, char **argv)
|
||||||
|
char *target, hnamebuf[MAX_HOSTNAMELEN];
|
||||||
|
char rspace[3 + 4 * NROUTES + 1]; /* record route space */
|
||||||
|
|
||||||
|
- icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
|
||||||
|
+ icmp_sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_ICMP);
|
||||||
|
+ if (icmp_sock != -1)
|
||||||
|
+ using_ping_socket = 1;
|
||||||
|
+ else
|
||||||
|
+ icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
|
||||||
|
socket_errno = errno;
|
||||||
|
|
||||||
|
uid = getuid();
|
||||||
|
@@ -377,13 +382,35 @@ main(int argc, char **argv)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- if ((options&F_STRICTSOURCE) &&
|
||||||
|
- bind(icmp_sock, (struct sockaddr*)&source, sizeof(source)) == -1) {
|
||||||
|
- perror("bind");
|
||||||
|
- exit(2);
|
||||||
|
+ if (!using_ping_socket) {
|
||||||
|
+ if ((options&F_STRICTSOURCE) &&
|
||||||
|
+ bind(icmp_sock, (struct sockaddr*)&source, sizeof(source)) == -1) {
|
||||||
|
+ perror("bind");
|
||||||
|
+ exit(2);
|
||||||
|
+ }
|
||||||
|
+ } else {
|
||||||
|
+ struct sockaddr_in sa;
|
||||||
|
+ socklen_t sl;
|
||||||
|
+
|
||||||
|
+ sa.sin_family = AF_INET;
|
||||||
|
+ sa.sin_port = 0;
|
||||||
|
+ sa.sin_addr.s_addr = (options&F_STRICTSOURCE) ?
|
||||||
|
+ source.sin_addr.s_addr : 0;
|
||||||
|
+ sl = sizeof(sa);
|
||||||
|
+
|
||||||
|
+ if (bind(icmp_sock, (struct sockaddr *) &sa, sl) == -1) {
|
||||||
|
+ perror("bind");
|
||||||
|
+ exit(2);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (getsockname(icmp_sock, (struct sockaddr *) &sa, &sl) == -1) {
|
||||||
|
+ perror("getsockname");
|
||||||
|
+ exit(2);
|
||||||
|
+ }
|
||||||
|
+ ident = sa.sin_port;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (1) {
|
||||||
|
+ if (!using_ping_socket) {
|
||||||
|
struct icmp_filter filt;
|
||||||
|
filt.data = ~((1<<ICMP_SOURCE_QUENCH)|
|
||||||
|
(1<<ICMP_DEST_UNREACH)|
|
||||||
|
@@ -398,6 +425,12 @@ main(int argc, char **argv)
|
||||||
|
hold = 1;
|
||||||
|
if (setsockopt(icmp_sock, SOL_IP, IP_RECVERR, (char *)&hold, sizeof(hold)))
|
||||||
|
fprintf(stderr, "WARNING: your kernel is veeery old. No problems.\n");
|
||||||
|
+ if (using_ping_socket) {
|
||||||
|
+ if (setsockopt(icmp_sock, SOL_IP, IP_RECVTTL, (char *)&hold, sizeof(hold)))
|
||||||
|
+ perror("WARNING: setsockopt(IP_RECVTTL)");
|
||||||
|
+ if (setsockopt(icmp_sock, SOL_IP, IP_RETOPTS, (char *)&hold, sizeof(hold)))
|
||||||
|
+ perror("WARNING: setsockopt(IP_RETOPTS)");
|
||||||
|
+ }
|
||||||
|
|
||||||
|
/* record route option */
|
||||||
|
if (options & F_RROUTE) {
|
||||||
|
@@ -566,6 +599,7 @@ int receive_error_msg()
|
||||||
|
nerrors++;
|
||||||
|
} else if (e->ee_origin == SO_EE_ORIGIN_ICMP) {
|
||||||
|
struct sockaddr_in *sin = (struct sockaddr_in*)(e+1);
|
||||||
|
+ int error_pkt;
|
||||||
|
|
||||||
|
if (res < sizeof(icmph) ||
|
||||||
|
target.sin_addr.s_addr != whereto.sin_addr.s_addr ||
|
||||||
|
@@ -576,9 +610,18 @@ int receive_error_msg()
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
|
- acknowledge(ntohs(icmph.un.echo.sequence));
|
||||||
|
+ error_pkt = (e->ee_type != ICMP_REDIRECT &&
|
||||||
|
+ e->ee_type != ICMP_SOURCE_QUENCH);
|
||||||
|
+ if (error_pkt) {
|
||||||
|
+ acknowledge(ntohs(icmph.un.echo.sequence));
|
||||||
|
+ net_errors++;
|
||||||
|
+ nerrors++;
|
||||||
|
+ }
|
||||||
|
+ else {
|
||||||
|
+ saved_errno = 0;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
- if (!working_recverr) {
|
||||||
|
+ if (!using_ping_socket && !working_recverr) {
|
||||||
|
struct icmp_filter filt;
|
||||||
|
working_recverr = 1;
|
||||||
|
/* OK, it works. Add stronger filter. */
|
||||||
|
@@ -589,15 +632,14 @@ int receive_error_msg()
|
||||||
|
perror("\rWARNING: setsockopt(ICMP_FILTER)");
|
||||||
|
}
|
||||||
|
|
||||||
|
- net_errors++;
|
||||||
|
- nerrors++;
|
||||||
|
if (options & F_QUIET)
|
||||||
|
goto out;
|
||||||
|
if (options & F_FLOOD) {
|
||||||
|
- write_stdout("\bE", 2);
|
||||||
|
+ if (error_pkt)
|
||||||
|
+ write_stdout("\bE", 2);
|
||||||
|
} else {
|
||||||
|
print_timestamp();
|
||||||
|
- printf("From %s icmp_seq=%u ", pr_addr(sin->sin_addr.s_addr), ntohs(icmph.un.echo.sequence));
|
||||||
|
+ printf("From %s: icmp_seq=%u ", pr_addr(sin->sin_addr.s_addr), ntohs(icmph.un.echo.sequence));
|
||||||
|
pr_icmph(e->ee_type, e->ee_code, e->ee_info, NULL);
|
||||||
|
fflush(stdout);
|
||||||
|
}
|
||||||
|
@@ -695,15 +737,41 @@ parse_reply(struct msghdr *msg, int cc,
|
||||||
|
struct iphdr *ip;
|
||||||
|
int hlen;
|
||||||
|
int csfailed;
|
||||||
|
+ struct cmsghdr *cmsg;
|
||||||
|
+ int ttl;
|
||||||
|
+ __u8 *opts;
|
||||||
|
+ int optlen;
|
||||||
|
|
||||||
|
/* Check the IP header */
|
||||||
|
ip = (struct iphdr *)buf;
|
||||||
|
- hlen = ip->ihl*4;
|
||||||
|
- if (cc < hlen + 8 || ip->ihl < 5) {
|
||||||
|
- if (options & F_VERBOSE)
|
||||||
|
- fprintf(stderr, "ping: packet too short (%d bytes) from %s\n", cc,
|
||||||
|
- pr_addr(from->sin_addr.s_addr));
|
||||||
|
- return 1;
|
||||||
|
+ if (!using_ping_socket) {
|
||||||
|
+ hlen = ip->ihl*4;
|
||||||
|
+ if (cc < hlen + 8 || ip->ihl < 5) {
|
||||||
|
+ if (options & F_VERBOSE)
|
||||||
|
+ fprintf(stderr, "ping: packet too short (%d bytes) from %s\n", cc,
|
||||||
|
+ pr_addr(from->sin_addr.s_addr));
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
+ ttl = ip->ttl;
|
||||||
|
+ opts = buf + sizeof(struct iphdr);
|
||||||
|
+ optlen = hlen - sizeof(struct iphdr);
|
||||||
|
+ } else {
|
||||||
|
+ hlen = 0;
|
||||||
|
+ ttl = 0;
|
||||||
|
+ opts = buf;
|
||||||
|
+ optlen = 0;
|
||||||
|
+ for (cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg)) {
|
||||||
|
+ if (cmsg->cmsg_level != SOL_IP)
|
||||||
|
+ continue;
|
||||||
|
+ if (cmsg->cmsg_type == IP_TTL) {
|
||||||
|
+ if (cmsg->cmsg_len < sizeof(int))
|
||||||
|
+ continue;
|
||||||
|
+ ttl = *(int *) CMSG_DATA(cmsg);
|
||||||
|
+ } else if (cmsg->cmsg_type == IP_RETOPTS) {
|
||||||
|
+ opts = (__u8 *) CMSG_DATA(cmsg);
|
||||||
|
+ optlen = cmsg->cmsg_len;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Now the ICMP part */
|
||||||
|
@@ -716,7 +784,7 @@ parse_reply(struct msghdr *msg, int cc,
|
||||||
|
return 1; /* 'Twas not our ECHO */
|
||||||
|
if (gather_statistics((__u8*)icp, sizeof(*icp), cc,
|
||||||
|
ntohs(icp->un.echo.sequence),
|
||||||
|
- ip->ttl, 0, tv, pr_addr(from->sin_addr.s_addr),
|
||||||
|
+ ttl, 0, tv, pr_addr(from->sin_addr.s_addr),
|
||||||
|
pr_echo_reply))
|
||||||
|
return 0;
|
||||||
|
} else {
|
||||||
|
@@ -807,7 +875,7 @@ parse_reply(struct msghdr *msg, int cc,
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!(options & F_FLOOD)) {
|
||||||
|
- pr_options(buf + sizeof(struct iphdr), hlen);
|
||||||
|
+ pr_options(opts, optlen + sizeof(struct iphdr));
|
||||||
|
|
||||||
|
if (options & F_AUDIBLE)
|
||||||
|
putchar('\a');
|
||||||
|
@@ -916,8 +984,7 @@ void pr_icmph(__u8 type, __u8 code, __u3
|
||||||
|
printf("Redirect, Bad Code: %d", code);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
- if (icp)
|
||||||
|
- printf("(New nexthop: %s)\n", pr_addr(icp->un.gateway));
|
||||||
|
+ printf("(New nexthop: %s)\n", pr_addr(icp ? icp->un.gateway : info));
|
||||||
|
if (icp && (options & F_VERBOSE))
|
||||||
|
pr_iph((struct iphdr*)(icp + 1));
|
||||||
|
break;
|
||||||
|
@@ -1217,7 +1284,7 @@ void install_filter(void)
|
||||||
|
insns
|
||||||
|
};
|
||||||
|
|
||||||
|
- if (once)
|
||||||
|
+ if (once || using_ping_socket)
|
||||||
|
return;
|
||||||
|
once = 1;
|
||||||
|
|
||||||
|
--- iputils-s20101006/ping_common.c
|
||||||
|
+++ iputils-s20101006/ping_common.c
|
||||||
|
@@ -515,7 +515,8 @@ void setup(int icmp_sock)
|
||||||
|
*p++ = i;
|
||||||
|
}
|
||||||
|
|
||||||
|
- ident = htons(getpid() & 0xFFFF);
|
||||||
|
+ if (!ident)
|
||||||
|
+ ident = htons(getpid() & 0xFFFF);
|
||||||
|
|
||||||
|
set_signal(SIGINT, sigexit);
|
||||||
|
set_signal(SIGALRM, sigexit);
|
||||||
@ -0,0 +1,64 @@
|
|||||||
|
From 23fcb10ae15a96aa9e5a823cfe0b612d9522691c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mike Frysinger <vapier@gentoo.org>
|
||||||
|
Date: Sat, 14 Aug 2010 01:16:42 -0400
|
||||||
|
Subject: [PATCH [iputils]] tracepath: re-use printf return in print_host
|
||||||
|
|
||||||
|
Since the printf funcs already return the length of chars displayed,
|
||||||
|
use that value instead of re-calculating the length with strlen.
|
||||||
|
|
||||||
|
This also fixes the handling of the strlen return -- it's a size_t,
|
||||||
|
not an int.
|
||||||
|
|
||||||
|
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
||||||
|
---
|
||||||
|
tracepath.c | 11 ++++-------
|
||||||
|
tracepath6.c | 11 ++++-------
|
||||||
|
2 files changed, 8 insertions(+), 14 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tracepath.c b/tracepath.c
|
||||||
|
index 8a08f1d..f155816 100644
|
||||||
|
--- a/tracepath.c
|
||||||
|
+++ b/tracepath.c
|
||||||
|
@@ -73,13 +73,10 @@ void data_wait(int fd)
|
||||||
|
|
||||||
|
void print_host(const char *a, const char *b, int both)
|
||||||
|
{
|
||||||
|
- int plen = 0;
|
||||||
|
- printf("%s", a);
|
||||||
|
- plen = strlen(a);
|
||||||
|
- if (both) {
|
||||||
|
- printf(" (%s)", b);
|
||||||
|
- plen += strlen(b) + 3;
|
||||||
|
- }
|
||||||
|
+ int plen;
|
||||||
|
+ plen = printf("%s", a);
|
||||||
|
+ if (both)
|
||||||
|
+ plen += printf(" (%s)", b);
|
||||||
|
if (plen >= HOST_COLUMN_SIZE)
|
||||||
|
plen = HOST_COLUMN_SIZE - 1;
|
||||||
|
printf("%*s", HOST_COLUMN_SIZE - plen, "");
|
||||||
|
diff --git a/tracepath6.c b/tracepath6.c
|
||||||
|
index 126fadf..bee95c3 100644
|
||||||
|
--- a/tracepath6.c
|
||||||
|
+++ b/tracepath6.c
|
||||||
|
@@ -86,13 +86,10 @@ void data_wait(int fd)
|
||||||
|
|
||||||
|
void print_host(const char *a, const char *b, int both)
|
||||||
|
{
|
||||||
|
- int plen = 0;
|
||||||
|
- printf("%s", a);
|
||||||
|
- plen = strlen(a);
|
||||||
|
- if (both) {
|
||||||
|
- printf(" (%s)", b);
|
||||||
|
- plen += strlen(b) + 3;
|
||||||
|
- }
|
||||||
|
+ int plen;
|
||||||
|
+ plen = printf("%s", a);
|
||||||
|
+ if (both)
|
||||||
|
+ plen += printf(" (%s)", b);
|
||||||
|
if (plen >= HOST_COLUMN_SIZE)
|
||||||
|
plen = HOST_COLUMN_SIZE - 1;
|
||||||
|
printf("%*s", HOST_COLUMN_SIZE - plen, "");
|
||||||
|
--
|
||||||
|
1.8.0.2
|
||||||
|
|
||||||
74
sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20100418-r3.ebuild
vendored
Normal file
74
sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20100418-r3.ebuild
vendored
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
# Copyright 1999-2010 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20100418-r1.ebuild,v 1.1 2010/09/14 01:58:24 vapier Exp $
|
||||||
|
|
||||||
|
inherit flag-o-matic eutils toolchain-funcs
|
||||||
|
|
||||||
|
DESCRIPTION="Network monitoring tools including ping and ping6"
|
||||||
|
HOMEPAGE="http://www.linux-foundation.org/en/Net:Iputils"
|
||||||
|
SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2
|
||||||
|
mirror://gentoo/iputils-s${PV}-manpages.tar.bz2"
|
||||||
|
|
||||||
|
LICENSE="BSD"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
|
||||||
|
IUSE="doc extras idn ipv6 SECURITY_HAZARD ssl static"
|
||||||
|
|
||||||
|
RDEPEND="extras? ( !net-misc/rarpd )
|
||||||
|
ssl? ( dev-libs/openssl )
|
||||||
|
idn? ( net-dns/libidn )"
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
virtual/os-headers"
|
||||||
|
|
||||||
|
S=${WORKDIR}/${PN}-s${PV}
|
||||||
|
|
||||||
|
src_unpack() {
|
||||||
|
unpack ${A}
|
||||||
|
cd "${S}"
|
||||||
|
epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch
|
||||||
|
epatch "${FILESDIR}"/${PN}-20100418-arping-broadcast.patch #337049
|
||||||
|
epatch "${FILESDIR}"/${PN}-20100418-openssl.patch #335436
|
||||||
|
epatch "${FILESDIR}"/${PN}-20100418-so_mark.patch #335347
|
||||||
|
epatch "${FILESDIR}"/${PN}-20100418-makefile.patch
|
||||||
|
epatch "${FILESDIR}"/${PN}-20100418-proper-libs.patch #332703
|
||||||
|
epatch "${FILESDIR}"/${PN}-20100418-printf-size.patch
|
||||||
|
epatch "${FILESDIR}"/${PN}-20100418-aliasing.patch
|
||||||
|
epatch "${FILESDIR}"/${PN}-20071127-kernel-ifaddr.patch
|
||||||
|
epatch "${FILESDIR}"/${PN}-20070202-idn.patch #218638
|
||||||
|
epatch "${FILESDIR}"/${PN}-20100418-ping-CVE-2010-2529.patch #332527
|
||||||
|
epatch "${FILESDIR}"/${PN}-20071127-infiniband.patch #377687
|
||||||
|
use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch
|
||||||
|
use static && append-ldflags -static
|
||||||
|
use ssl && append-cppflags -DHAVE_OPENSSL
|
||||||
|
use ipv6 || sed -i -e 's:IPV6_TARGETS=:#IPV6_TARGETS=:' Makefile
|
||||||
|
export IDN=$(use idn && echo yes)
|
||||||
|
}
|
||||||
|
|
||||||
|
src_compile() {
|
||||||
|
tc-export CC
|
||||||
|
emake || die "make main failed"
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
into /
|
||||||
|
dobin ping || die "ping"
|
||||||
|
use ipv6 && dobin ping6
|
||||||
|
dosbin arping || die "arping"
|
||||||
|
into /usr
|
||||||
|
dosbin tracepath || die "tracepath"
|
||||||
|
use ipv6 && dosbin trace{path,route}6
|
||||||
|
use extras && \
|
||||||
|
{ dosbin clockdiff rarpd rdisc ipg tftpd || die "misc sbin"; }
|
||||||
|
|
||||||
|
fperms 4711 /bin/ping
|
||||||
|
use ipv6 && fperms 4711 /bin/ping6 /usr/sbin/traceroute6
|
||||||
|
|
||||||
|
dodoc INSTALL RELNOTES
|
||||||
|
use ipv6 \
|
||||||
|
&& dosym ping.8 /usr/share/man/man8/ping6.8 \
|
||||||
|
|| rm -f doc/*6.8
|
||||||
|
rm -f doc/setkey.8
|
||||||
|
doman doc/*.8
|
||||||
|
|
||||||
|
use doc && dohtml doc/*.html
|
||||||
|
}
|
||||||
94
sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20101006-r2.ebuild
vendored
Normal file
94
sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20101006-r2.ebuild
vendored
Normal file
@ -0,0 +1,94 @@
|
|||||||
|
# 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-20101006-r2.ebuild,v 1.8 2013/01/25 05:28:28 vapier Exp $
|
||||||
|
|
||||||
|
# For released versions, we precompile the man/html pages and store
|
||||||
|
# them in a tarball on our mirrors. This avoids ugly issues while
|
||||||
|
# building stages, and when the jade/sgml packages are broken (which
|
||||||
|
# seems to be more common than would be nice).
|
||||||
|
|
||||||
|
EAPI="2"
|
||||||
|
|
||||||
|
inherit flag-o-matic eutils toolchain-funcs
|
||||||
|
if [[ ${PV} == "99999999" ]] ; then
|
||||||
|
EGIT_REPO_URI="git://www.linux-ipv6.org/gitroot/iputils"
|
||||||
|
inherit git-2
|
||||||
|
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"
|
||||||
|
fi
|
||||||
|
|
||||||
|
DESCRIPTION="Network monitoring tools including ping and ping6"
|
||||||
|
HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils"
|
||||||
|
|
||||||
|
LICENSE="BSD"
|
||||||
|
SLOT="0"
|
||||||
|
IUSE="doc idn ipv6 SECURITY_HAZARD ssl static"
|
||||||
|
|
||||||
|
RDEPEND="!net-misc/rarpd
|
||||||
|
ssl? ( dev-libs/openssl )
|
||||||
|
idn? ( net-dns/libidn )"
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
virtual/os-headers"
|
||||||
|
if [[ ${PV} == "99999999" ]] ; then
|
||||||
|
DEPEND+="
|
||||||
|
app-text/openjade
|
||||||
|
dev-perl/SGMLSpm
|
||||||
|
app-text/docbook-sgml-dtd
|
||||||
|
app-text/docbook-sgml-utils
|
||||||
|
"
|
||||||
|
fi
|
||||||
|
|
||||||
|
S=${WORKDIR}/${PN}-s${PV}
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch
|
||||||
|
epatch "${FILESDIR}"/${PN}-20100418-openssl.patch #335436
|
||||||
|
epatch "${FILESDIR}"/${PN}-20100418-so_mark.patch #335347
|
||||||
|
epatch "${FILESDIR}"/${PN}-20100418-makefile.patch
|
||||||
|
epatch "${FILESDIR}"/${PN}-20100418-proper-libs.patch #332703
|
||||||
|
epatch "${FILESDIR}"/${PN}-20100418-printf-size.patch
|
||||||
|
epatch "${FILESDIR}"/${PN}-20100418-aliasing.patch
|
||||||
|
epatch "${FILESDIR}"/${PN}-20071127-kernel-ifaddr.patch
|
||||||
|
epatch "${FILESDIR}"/${PN}-20070202-idn.patch #218638
|
||||||
|
epatch "${FILESDIR}"/${PN}-20071127-infiniband.patch #377687
|
||||||
|
epatch "${FILESDIR}"/${PN}-20101006-owl-pingsock.diff
|
||||||
|
use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch
|
||||||
|
use static && append-ldflags -static
|
||||||
|
use ssl && append-cppflags -DHAVE_OPENSSL
|
||||||
|
use ipv6 || sed -i -e 's:IPV6_TARGETS=:#IPV6_TARGETS=:' Makefile
|
||||||
|
export IDN=$(use idn && echo yes)
|
||||||
|
}
|
||||||
|
|
||||||
|
src_compile() {
|
||||||
|
tc-export CC
|
||||||
|
emake || die
|
||||||
|
|
||||||
|
if [[ ${PV} == "99999999" ]] ; then
|
||||||
|
emake -j1 html man || die
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
into /
|
||||||
|
dobin ping || die
|
||||||
|
use ipv6 && dobin ping6
|
||||||
|
dosbin arping || die
|
||||||
|
into /usr
|
||||||
|
dosbin tracepath || die
|
||||||
|
use ipv6 && dosbin trace{path,route}6
|
||||||
|
dosbin clockdiff rarpd rdisc ipg tftpd || die
|
||||||
|
|
||||||
|
fperms 4711 /bin/ping
|
||||||
|
use ipv6 && fperms 4711 /bin/ping6 /usr/sbin/traceroute6
|
||||||
|
|
||||||
|
dodoc INSTALL RELNOTES
|
||||||
|
use ipv6 \
|
||||||
|
&& dosym ping.8 /usr/share/man/man8/ping6.8 \
|
||||||
|
|| rm -f doc/*6.8
|
||||||
|
rm -f doc/setkey.8
|
||||||
|
doman doc/*.8
|
||||||
|
|
||||||
|
use doc && dohtml doc/*.html
|
||||||
|
}
|
||||||
101
sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20121221-r1.ebuild
vendored
Normal file
101
sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20121221-r1.ebuild
vendored
Normal file
@ -0,0 +1,101 @@
|
|||||||
|
# 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-r1.ebuild,v 1.3 2013/01/28 20:05:01 vapier Exp $
|
||||||
|
|
||||||
|
# For released versions, we precompile the man/html pages and store
|
||||||
|
# them in a tarball on our mirrors. This avoids ugly issues while
|
||||||
|
# building stages, and when the jade/sgml packages are broken (which
|
||||||
|
# seems to be more common than would be nice).
|
||||||
|
|
||||||
|
EAPI="4"
|
||||||
|
|
||||||
|
inherit flag-o-matic eutils toolchain-funcs fcaps
|
||||||
|
if [[ ${PV} == "99999999" ]] ; then
|
||||||
|
EGIT_REPO_URI="git://www.linux-ipv6.org/gitroot/iputils"
|
||||||
|
inherit git-2
|
||||||
|
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"
|
||||||
|
fi
|
||||||
|
|
||||||
|
DESCRIPTION="Network monitoring tools including ping and ping6"
|
||||||
|
HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils"
|
||||||
|
|
||||||
|
LICENSE="BSD"
|
||||||
|
SLOT="0"
|
||||||
|
IUSE="caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static"
|
||||||
|
|
||||||
|
LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
|
||||||
|
idn? ( net-dns/libidn[static-libs(+)] )
|
||||||
|
ipv6? (
|
||||||
|
gnutls? ( net-libs/gnutls[static-libs(+)] )
|
||||||
|
ssl? ( dev-libs/openssl:0[static-libs(+)] )
|
||||||
|
)"
|
||||||
|
RDEPEND="!net-misc/rarpd
|
||||||
|
!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
static? ( ${LIB_DEPEND} )
|
||||||
|
virtual/os-headers"
|
||||||
|
if [[ ${PV} == "99999999" ]] ; then
|
||||||
|
DEPEND+="
|
||||||
|
app-text/openjade
|
||||||
|
dev-perl/SGMLSpm
|
||||||
|
app-text/docbook-sgml-dtd
|
||||||
|
app-text/docbook-sgml-utils
|
||||||
|
"
|
||||||
|
fi
|
||||||
|
|
||||||
|
S=${WORKDIR}/${PN}-s${PV}
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch
|
||||||
|
epatch "${FILESDIR}"/${PN}-20121221-openssl.patch #335436
|
||||||
|
epatch "${FILESDIR}"/${PN}-20121221-crypto-build.patch
|
||||||
|
epatch "${FILESDIR}"/${PN}-20100418-so_mark.patch #335347
|
||||||
|
epatch "${FILESDIR}"/${PN}-20121221-makefile.patch
|
||||||
|
epatch "${FILESDIR}"/${PN}-20121221-printf-size.patch
|
||||||
|
epatch "${FILESDIR}"/${PN}-20121221-owl-pingsock.diff
|
||||||
|
use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch
|
||||||
|
use static && append-ldflags -static
|
||||||
|
}
|
||||||
|
|
||||||
|
src_compile() {
|
||||||
|
tc-export CC
|
||||||
|
emake \
|
||||||
|
USE_CAP=$(usex caps) \
|
||||||
|
USE_IDN=$(usex idn) \
|
||||||
|
USE_GNUTLS=$(usex gnutls) \
|
||||||
|
USE_CRYPTO=$(usex ssl) \
|
||||||
|
$(use ipv6 || echo IPV6_TARGETS=)
|
||||||
|
|
||||||
|
if [[ ${PV} == "99999999" ]] ; then
|
||||||
|
emake -j1 html man
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
ipv6() { usex ipv6 "$*" '' ; }
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
into /
|
||||||
|
dobin arping ping $(ipv6 ping6)
|
||||||
|
into /usr
|
||||||
|
dobin clockdiff
|
||||||
|
dosbin rarpd rdisc ipg tftpd tracepath $(ipv6 tracepath6)
|
||||||
|
|
||||||
|
dodoc INSTALL RELNOTES
|
||||||
|
use ipv6 \
|
||||||
|
&& dosym ping.8 /usr/share/man/man8/ping6.8 \
|
||||||
|
|| rm -f doc/*6.8
|
||||||
|
rm -f doc/{setkey,traceroute6}.8
|
||||||
|
doman doc/*.8
|
||||||
|
|
||||||
|
use doc && dohtml doc/*.html
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postinst() {
|
||||||
|
fcaps cap_net_raw \
|
||||||
|
bin/{ar,}ping \
|
||||||
|
$(ipv6 bin/ping6) \
|
||||||
|
usr/bin/clockdiff
|
||||||
|
}
|
||||||
98
sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20121221.ebuild
vendored
Normal file
98
sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-20121221.ebuild
vendored
Normal file
@ -0,0 +1,98 @@
|
|||||||
|
# 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 $
|
||||||
|
|
||||||
|
# For released versions, we precompile the man/html pages and store
|
||||||
|
# them in a tarball on our mirrors. This avoids ugly issues while
|
||||||
|
# building stages, and when the jade/sgml packages are broken (which
|
||||||
|
# seems to be more common than would be nice).
|
||||||
|
|
||||||
|
EAPI="4"
|
||||||
|
|
||||||
|
inherit flag-o-matic eutils toolchain-funcs
|
||||||
|
if [[ ${PV} == "99999999" ]] ; then
|
||||||
|
EGIT_REPO_URI="git://www.linux-ipv6.org/gitroot/iputils"
|
||||||
|
inherit git-2
|
||||||
|
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"
|
||||||
|
fi
|
||||||
|
|
||||||
|
DESCRIPTION="Network monitoring tools including ping and ping6"
|
||||||
|
HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils"
|
||||||
|
|
||||||
|
LICENSE="BSD"
|
||||||
|
SLOT="0"
|
||||||
|
IUSE="caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static"
|
||||||
|
|
||||||
|
LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
|
||||||
|
idn? ( net-dns/libidn[static-libs(+)] )
|
||||||
|
ipv6? (
|
||||||
|
gnutls? ( net-libs/gnutls[static-libs(+)] )
|
||||||
|
ssl? ( dev-libs/openssl:0[static-libs(+)] )
|
||||||
|
)"
|
||||||
|
RDEPEND="!net-misc/rarpd
|
||||||
|
!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
static? ( ${LIB_DEPEND} )
|
||||||
|
virtual/os-headers"
|
||||||
|
if [[ ${PV} == "99999999" ]] ; then
|
||||||
|
DEPEND+="
|
||||||
|
app-text/openjade
|
||||||
|
dev-perl/SGMLSpm
|
||||||
|
app-text/docbook-sgml-dtd
|
||||||
|
app-text/docbook-sgml-utils
|
||||||
|
"
|
||||||
|
fi
|
||||||
|
|
||||||
|
S=${WORKDIR}/${PN}-s${PV}
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch
|
||||||
|
epatch "${FILESDIR}"/${PN}-20121221-openssl.patch #335436
|
||||||
|
epatch "${FILESDIR}"/${PN}-20121221-crypto-build.patch
|
||||||
|
epatch "${FILESDIR}"/${PN}-20100418-so_mark.patch #335347
|
||||||
|
epatch "${FILESDIR}"/${PN}-20121221-makefile.patch
|
||||||
|
epatch "${FILESDIR}"/${PN}-20121221-printf-size.patch
|
||||||
|
epatch "${FILESDIR}"/${PN}-20121221-owl-pingsock.diff
|
||||||
|
use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch
|
||||||
|
use static && append-ldflags -static
|
||||||
|
}
|
||||||
|
|
||||||
|
src_compile() {
|
||||||
|
tc-export CC
|
||||||
|
emake \
|
||||||
|
USE_CAP=$(usex caps) \
|
||||||
|
USE_IDN=$(usex idn) \
|
||||||
|
USE_GNUTLS=$(usex gnutls) \
|
||||||
|
USE_CRYPTO=$(usex ssl) \
|
||||||
|
$(use ipv6 || echo IPV6_TARGETS=)
|
||||||
|
|
||||||
|
if [[ ${PV} == "99999999" ]] ; then
|
||||||
|
emake -j1 html man
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
into /
|
||||||
|
dobin ping
|
||||||
|
use ipv6 && dobin ping6
|
||||||
|
dosbin arping
|
||||||
|
into /usr
|
||||||
|
dosbin tracepath
|
||||||
|
use ipv6 && dosbin trace{path,route}6
|
||||||
|
dosbin clockdiff rarpd rdisc ipg tftpd
|
||||||
|
|
||||||
|
fperms 4711 /bin/ping
|
||||||
|
use ipv6 && fperms 4711 /bin/ping6 /usr/sbin/traceroute6
|
||||||
|
|
||||||
|
dodoc INSTALL RELNOTES
|
||||||
|
use ipv6 \
|
||||||
|
&& dosym ping.8 /usr/share/man/man8/ping6.8 \
|
||||||
|
|| rm -f doc/*6.8
|
||||||
|
rm -f doc/setkey.8
|
||||||
|
doman doc/*.8
|
||||||
|
|
||||||
|
use doc && dohtml doc/*.html
|
||||||
|
}
|
||||||
100
sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-99999999.ebuild
vendored
Normal file
100
sdk_container/src/third_party/portage-stable/net-misc/iputils/iputils-99999999.ebuild
vendored
Normal file
@ -0,0 +1,100 @@
|
|||||||
|
# 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-99999999.ebuild,v 1.10 2013/01/28 20:05:01 vapier Exp $
|
||||||
|
|
||||||
|
# For released versions, we precompile the man/html pages and store
|
||||||
|
# them in a tarball on our mirrors. This avoids ugly issues while
|
||||||
|
# building stages, and when the jade/sgml packages are broken (which
|
||||||
|
# seems to be more common than would be nice).
|
||||||
|
|
||||||
|
EAPI="4"
|
||||||
|
|
||||||
|
inherit flag-o-matic eutils toolchain-funcs fcaps
|
||||||
|
if [[ ${PV} == "99999999" ]] ; then
|
||||||
|
EGIT_REPO_URI="git://www.linux-ipv6.org/gitroot/iputils"
|
||||||
|
inherit git-2
|
||||||
|
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"
|
||||||
|
fi
|
||||||
|
|
||||||
|
DESCRIPTION="Network monitoring tools including ping and ping6"
|
||||||
|
HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils"
|
||||||
|
|
||||||
|
LICENSE="BSD"
|
||||||
|
SLOT="0"
|
||||||
|
IUSE="caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static"
|
||||||
|
|
||||||
|
LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
|
||||||
|
idn? ( net-dns/libidn[static-libs(+)] )
|
||||||
|
ipv6? (
|
||||||
|
gnutls? ( net-libs/gnutls[static-libs(+)] )
|
||||||
|
ssl? ( dev-libs/openssl:0[static-libs(+)] )
|
||||||
|
)"
|
||||||
|
RDEPEND="!net-misc/rarpd
|
||||||
|
!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
static? ( ${LIB_DEPEND} )
|
||||||
|
virtual/os-headers"
|
||||||
|
if [[ ${PV} == "99999999" ]] ; then
|
||||||
|
DEPEND+="
|
||||||
|
app-text/openjade
|
||||||
|
dev-perl/SGMLSpm
|
||||||
|
app-text/docbook-sgml-dtd
|
||||||
|
app-text/docbook-sgml-utils
|
||||||
|
"
|
||||||
|
fi
|
||||||
|
|
||||||
|
S=${WORKDIR}/${PN}-s${PV}
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch
|
||||||
|
epatch "${FILESDIR}"/${PN}-20121221-openssl.patch #335436
|
||||||
|
epatch "${FILESDIR}"/${PN}-20100418-so_mark.patch #335347
|
||||||
|
epatch "${FILESDIR}"/${PN}-20121221-makefile.patch
|
||||||
|
epatch "${FILESDIR}"/${PN}-20121221-printf-size.patch
|
||||||
|
epatch "${FILESDIR}"/${PN}-20121221-owl-pingsock.diff
|
||||||
|
use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch
|
||||||
|
use static && append-ldflags -static
|
||||||
|
}
|
||||||
|
|
||||||
|
src_compile() {
|
||||||
|
tc-export CC
|
||||||
|
emake \
|
||||||
|
USE_CAP=$(usex caps) \
|
||||||
|
USE_IDN=$(usex idn) \
|
||||||
|
USE_GNUTLS=$(usex gnutls) \
|
||||||
|
USE_CRYPTO=$(usex ssl) \
|
||||||
|
$(use ipv6 || echo IPV6_TARGETS=)
|
||||||
|
|
||||||
|
if [[ ${PV} == "99999999" ]] ; then
|
||||||
|
emake -j1 html man
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
ipv6() { usex ipv6 "$*" '' ; }
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
into /
|
||||||
|
dobin arping ping $(ipv6 ping6)
|
||||||
|
into /usr
|
||||||
|
dobin clockdiff
|
||||||
|
dosbin rarpd rdisc ipg tftpd tracepath $(ipv6 tracepath6)
|
||||||
|
|
||||||
|
dodoc INSTALL RELNOTES
|
||||||
|
use ipv6 \
|
||||||
|
&& dosym ping.8 /usr/share/man/man8/ping6.8 \
|
||||||
|
|| rm -f doc/*6.8
|
||||||
|
rm -f doc/{setkey,traceroute6}.8
|
||||||
|
doman doc/*.8
|
||||||
|
|
||||||
|
use doc && dohtml doc/*.html
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postinst() {
|
||||||
|
fcaps cap_net_raw \
|
||||||
|
bin/{ar,}ping \
|
||||||
|
$(ipv6 bin/ping6) \
|
||||||
|
usr/bin/clockdiff
|
||||||
|
}
|
||||||
8
sdk_container/src/third_party/portage-stable/net-misc/iputils/metadata.xml
vendored
Normal file
8
sdk_container/src/third_party/portage-stable/net-misc/iputils/metadata.xml
vendored
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||||
|
<pkgmetadata>
|
||||||
|
<herd>base-system</herd>
|
||||||
|
<use>
|
||||||
|
<flag name="SECURITY_HAZARD">Allow non-root users to flood (ping -f). This is generally a very bad idea.</flag>
|
||||||
|
</use>
|
||||||
|
</pkgmetadata>
|
||||||
Loading…
x
Reference in New Issue
Block a user