On Thu, Dec 15, 2016 at 02:50:38PM +0100, Clemens Gruber wrote:
> The current version of iputils ping can handle IPv4 and IPv6 and does
> not need the big GnuTLS/libgcrypt/.. dependency.
> tracepath can also handle both v4 and v6.
>
> Signed-off-by: Clemens Gruber
> ---
> rules/iputils.in | 41 +++--
> rules/iputils.make | 12 +---
> 2 files changed, 16 insertions(+), 37 deletions(-)
>
> diff --git a/rules/iputils.in b/rules/iputils.in
> index 99105f7..4a842a6 100644
> --- a/rules/iputils.in
> +++ b/rules/iputils.in
> @@ -3,10 +3,9 @@
> menuconfig IPUTILS
> tristate
> prompt "iputils "
> - select LIBC_RESOLV if IPUTILS_PING6
> - select LIBCAP if IPUTILS_ARPING || IPUTILS_PING ||
> IPUTILS_PING6 || IPUTILS_TRACEROUTE6 || IPUTILS_CLOCKDIFF
> - select GNUTLS if IPUTILS_PING6
> - select GNUTLS_OPENSSL if IPUTILS_PING6
> + select LIBC_RESOLV if IPUTILS_PING
> + select LIBCAP if IPUTILS_ARPING || IPUTILS_PING ||
> IPUTILS_TRACEROUTE6 || IPUTILS_CLOCKDIFF
> + select NETTLE if IPUTILS_PING
> help
> The iputils package is set of small useful utilities for Linux
> networking.
> @@ -35,12 +34,12 @@ config IPUTILS_PING
> bool
> depends on (!BUSYBOX_PING && !INETUTILS_PING) || ALLYES
> prompt "ping"
> + depends on GLOBAL_IPV6
> help
> - The ping command uses the ICMP protocol's mandatory ECHO_REQUEST
> datagram
> - to elicit an ICMP ECHO_RESPONSE from a host or gateway. ECHO_REQUEST
> - datagrams pings have an IP and ICMP header, followed by a struct
> - timeval and then an arbitrary number of pad bytes used to fill out
> - the packet.
> + ping uses the ICMP protocols mandatory ECHO_REQUEST datagram to elicit
> + an ICMP ECHO_RESPONSE from a host or gateway.
> + It works with both IPv4 and IPv6. Using only one of them explicitly
> can
> + be enforced by specifying -4 or -6.
>
> comment "inetutils' ping is selected!"
> depends on INETUTILS_PING
> @@ -48,22 +47,6 @@ comment "inetutils' ping is selected!"
> comment "BusyBox' ping is selected!"
> depends on BUSYBOX_PING
>
> -config IPUTILS_PING6
> - bool
> - depends on (!BUSYBOX_PING6 && !INETUTILS_PING6) || ALLYES
> - prompt "ping6"
> - depends on GLOBAL_IPV6
> - help
> - The ping6 command is IPv6 version of ping, and can also send Node
> - Information Queries (RFC4620). Intermediate hops may not be allowed,
> - because IPv6 source routing was deprecated (RFC5095).
> -
> -comment "inetutils' ping6 is selected!"
> -depends on INETUTILS_PING6
> -
> -comment "BusyBox' ping6 is selected!"
> -depends on BUSYBOX_PING6
> -
> config IPUTILS_RARPD
> bool
> prompt "rarpd"
> @@ -97,13 +80,10 @@ comment "BusyBox' tftpd is selected!"
> config IPUTILS_TRACEPATH
> bool
> prompt "tracepath"
> - help
> -
> -config IPUTILS_TRACEPATH6
> - bool
> - prompt "tracepath6"
> depends on GLOBAL_IPV6
> help
> + tracepath traces the path to a network host discovering the MTU along
> + this path.
>
> config IPUTILS_TRACEROUTE6
> bool
> @@ -111,6 +91,7 @@ config IPUTILS_TRACEROUTE6
> prompt "traceroute6"
> depends on GLOBAL_IPV6
> help
> + traceroute6 prints the route packets trace to network hosts.
>
> comment "BusyBox' traceroute6 is selected!"
> depends on BUSYBOX_TRACEROUTE6
> diff --git a/rules/iputils.make b/rules/iputils.make
> index dc93d5c..f07e325 100644
> --- a/rules/iputils.make
> +++ b/rules/iputils.make
> @@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_IPUTILS) += iputils
> #
> # Paths and names
> #
> -IPUTILS_VERSION := s20121221
> -IPUTILS_MD5 := 6072aef64205720dd1893b375e184171
> +IPUTILS_VERSION := s20161105
> +IPUTILS_MD5 := 06f0be2dabe10dc80fdb328073230e69
> IPUTILS := iputils-$(IPUTILS_VERSION)
> -IPUTILS_SUFFIX := tar.bz2
> -IPUTILS_URL := http://www.skbuff.net/iputils/$(IPUTILS).$(IPUTILS_SUFFIX)
> +IPUTILS_SUFFIX := tar.gz
> +IPUTILS_URL :=
> http://codeload.github.com/iputils/iputils/$(IPUTILS_SUFFIX)/$(IPUTILS_VERSION)
This URL is broken.
Michael
> IPUTILS_SOURCE := $(SRCDIR)/$(IPUTILS).$(IPUTILS_SUFFIX)
> IPUTILS_DIR := $(BUILDDIR)/$(IPUTILS)
> IPUTILS_LICENSE := GPL-2.0
> @@ -34,16 +34,14 @@ IPUTILS_TOOLS-y :=
> IPUTILS_TOOLS-$(PTXCONF_IPUTILS_ARPING) += arping
> IPUTILS_TOOLS-$(PTXCONF_IPUTILS_CLOCKDIFF) += clockdiff
> IPUTILS_TOOLS-$(PTXCONF_IPUTILS_PING)+= ping
> -IPUTILS_TOOLS-$(PTXCONF_IPUTILS_PING6) += ping6
> IPUTILS_TOOLS-$(PTXCONF_IPUTILS_RARPD) += rarpd
> IPUTILS_TOOLS-$(PTXCONF_IPUTILS_RDISC) += rdisc
>