diff options
Diffstat (limited to 'meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch')
-rw-r--r-- | meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch b/meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch index 24c134fcac..603d2baf9d 100644 --- a/meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch +++ b/meta/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch | |||
@@ -1,17 +1,22 @@ | |||
1 | Upstream: http://www.mail-archive.com/bug-inetutils@gnu.org/msg02103.html | 1 | From c7c27ba763c613f83c1561e56448b49315c271c5 Mon Sep 17 00:00:00 2001 |
2 | From: Jackie Huang <jackie.huang@windriver.com> | ||
3 | Date: Wed, 6 Mar 2019 09:36:11 -0500 | ||
4 | Subject: [PATCH] Upstream: | ||
5 | http://www.mail-archive.com/bug-inetutils@gnu.org/msg02103.html | ||
2 | 6 | ||
3 | Upstream-Status: Pending | 7 | Upstream-Status: Pending |
4 | 8 | ||
5 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | 9 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> |
10 | |||
6 | --- | 11 | --- |
7 | ping/ping_common.h | 20 ++++++++++++++++++++ | 12 | ping/ping_common.h | 20 ++++++++++++++++++++ |
8 | 1 file changed, 20 insertions(+) | 13 | 1 file changed, 20 insertions(+) |
9 | 14 | ||
10 | diff --git a/ping/ping_common.h b/ping/ping_common.h | 15 | diff --git a/ping/ping_common.h b/ping/ping_common.h |
11 | index 1dfd1b5..3bfbd12 100644 | 16 | index 65e3e60..3e84db0 100644 |
12 | --- a/ping/ping_common.h | 17 | --- a/ping/ping_common.h |
13 | +++ b/ping/ping_common.h | 18 | +++ b/ping/ping_common.h |
14 | @@ -17,10 +17,14 @@ | 19 | @@ -18,10 +18,14 @@ |
15 | You should have received a copy of the GNU General Public License | 20 | You should have received a copy of the GNU General Public License |
16 | along with this program. If not, see `http://www.gnu.org/licenses/'. */ | 21 | along with this program. If not, see `http://www.gnu.org/licenses/'. */ |
17 | 22 | ||
@@ -26,7 +31,7 @@ index 1dfd1b5..3bfbd12 100644 | |||
26 | #include <icmp.h> | 31 | #include <icmp.h> |
27 | #include <error.h> | 32 | #include <error.h> |
28 | #include <progname.h> | 33 | #include <progname.h> |
29 | @@ -62,7 +66,12 @@ struct ping_stat | 34 | @@ -63,7 +67,12 @@ struct ping_stat |
30 | want to follow the traditional behaviour of ping. */ | 35 | want to follow the traditional behaviour of ping. */ |
31 | #define DEFAULT_PING_COUNT 0 | 36 | #define DEFAULT_PING_COUNT 0 |
32 | 37 | ||
@@ -39,9 +44,9 @@ index 1dfd1b5..3bfbd12 100644 | |||
39 | #define PING_TIMING(s) ((s) >= sizeof (struct timeval)) | 44 | #define PING_TIMING(s) ((s) >= sizeof (struct timeval)) |
40 | #define PING_DATALEN (64 - PING_HEADER_LEN) /* default data length */ | 45 | #define PING_DATALEN (64 - PING_HEADER_LEN) /* default data length */ |
41 | 46 | ||
42 | @@ -74,13 +83,20 @@ struct ping_stat | 47 | @@ -78,13 +87,20 @@ struct ping_stat |
43 | (t).tv_usec = ((i)%PING_PRECISION)*(1000000/PING_PRECISION) ;\ | 48 | |
44 | } while (0) | 49 | #define PING_MIN_USER_INTERVAL (200000/PING_PRECISION) |
45 | 50 | ||
46 | +#ifdef HAVE_IPV6 | 51 | +#ifdef HAVE_IPV6 |
47 | /* FIXME: Adjust IPv6 case for options and their consumption. */ | 52 | /* FIXME: Adjust IPv6 case for options and their consumption. */ |
@@ -60,7 +65,7 @@ index 1dfd1b5..3bfbd12 100644 | |||
60 | 65 | ||
61 | typedef int (*ping_efp) (int code, | 66 | typedef int (*ping_efp) (int code, |
62 | void *closure, | 67 | void *closure, |
63 | @@ -89,13 +105,17 @@ typedef int (*ping_efp) (int code, | 68 | @@ -93,13 +109,17 @@ typedef int (*ping_efp) (int code, |
64 | struct ip * ip, icmphdr_t * icmp, int datalen); | 69 | struct ip * ip, icmphdr_t * icmp, int datalen); |
65 | 70 | ||
66 | union event { | 71 | union event { |
@@ -78,6 +83,3 @@ index 1dfd1b5..3bfbd12 100644 | |||
78 | }; | 83 | }; |
79 | 84 | ||
80 | typedef struct ping_data PING; | 85 | typedef struct ping_data PING; |
81 | -- | ||
82 | 2.8.3 | ||
83 | |||