diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2016-08-04 16:07:17 +0200 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2016-08-04 16:07:29 +0200 |
| commit | 63d3dcfd13613f7b9eb23f2b20533dc0e310112c (patch) | |
| tree | 52e55f8b2c14d8fdb949c1a50274d8a049812907 /net-analyzer/mtr/files | |
| parent | net-misc/stuntman: Version bump to 1.2.9; remove 1.2.6 ebuilds. (diff) | |
| download | gentoo-63d3dcfd13613f7b9eb23f2b20533dc0e310112c.tar.gz gentoo-63d3dcfd13613f7b9eb23f2b20533dc0e310112c.tar.bz2 gentoo-63d3dcfd13613f7b9eb23f2b20533dc0e310112c.zip | |
net-analyzer/mtr: Fix building with USE="-ipv6 -gtk".
Package-Manager: portage-2.3.0
Diffstat (limited to 'net-analyzer/mtr/files')
| -rw-r--r-- | net-analyzer/mtr/files/mtr-9999-ipv6.patch | 59 | ||||
| -rw-r--r-- | net-analyzer/mtr/files/mtr-9999-strings.patch | 12 |
2 files changed, 71 insertions, 0 deletions
diff --git a/net-analyzer/mtr/files/mtr-9999-ipv6.patch b/net-analyzer/mtr/files/mtr-9999-ipv6.patch new file mode 100644 index 000000000000..32a62853387c --- /dev/null +++ b/net-analyzer/mtr/files/mtr-9999-ipv6.patch @@ -0,0 +1,59 @@ +--- a/net.c ++++ b/net.c +@@ -320,9 +320,13 @@ + struct sockaddr_storage local; + struct sockaddr_storage remote; + struct sockaddr_in *local4 = (struct sockaddr_in *) &local; ++#ifdef ENABLE_IPV6 + struct sockaddr_in6 *local6 = (struct sockaddr_in6 *) &local; ++#endif + struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote; ++#ifdef ENABLE_IPV6 + struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote; ++#endif + socklen_t len; + + ttl = index + 1; +@@ -437,9 +441,13 @@ + struct sockaddr_storage local; + struct sockaddr_storage remote; + struct sockaddr_in *local4 = (struct sockaddr_in *) &local; ++#ifdef ENABLE_IPV6 + struct sockaddr_in6 *local6 = (struct sockaddr_in6 *) &local; ++#endif + struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote; ++#ifdef ENABLE_IPV6 + struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote; ++#endif + socklen_t len; + + ttl = index + 1; +@@ -726,8 +734,12 @@ + + /* sendto() assumes packet length includes the IPv4 header but not the + IPv6 header. */ ++#ifdef ENABLE_IPV6 + spacketsize = abs(packetsize) - + ( ( af == AF_INET ) ? 0 : sizeof (struct ip6_hdr) ); ++#else ++ spacketsize = abs(packetsize); ++#endif + rv = sendto(sendsock, packet, spacketsize, 0, remotesockaddr, salen); + if (first && (rv < 0) && ((errno == EINVAL) || (errno == EMSGSIZE))) { + /* Try the first packet again using host byte order. */ +@@ -1535,11 +1547,15 @@ + struct sockaddr_in name_struct; + #endif + struct sockaddr_in * sa4; ++#ifdef ENABLE_IPV6 + struct sockaddr_in6 * sa6; ++#endif + struct sockaddr * name = (struct sockaddr *) &name_struct; + struct sockaddr_storage remote; + struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote; ++#ifdef ENABLE_IPV6 + struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote; ++#endif + socklen_t len; + int s; + diff --git a/net-analyzer/mtr/files/mtr-9999-strings.patch b/net-analyzer/mtr/files/mtr-9999-strings.patch new file mode 100644 index 000000000000..878382bde772 --- /dev/null +++ b/net-analyzer/mtr/files/mtr-9999-strings.patch @@ -0,0 +1,12 @@ +--- a/dns.c ++++ b/dns.c +@@ -49,7 +49,8 @@ + #include <unistd.h> + #include <fcntl.h> + //#include <ctype.h> +-//#include <string.h> ++#include <string.h> ++#include <strings.h> + #include <stdio.h> + #include <stdlib.h> + #include <signal.h> |