diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-02-01 20:02:08 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-06 11:06:30 +0000 |
commit | 58ce11215d2928f517c5f96fc85cd0aa6ed9b862 (patch) | |
tree | 4f96f7d501ab0fa4888e6b2b352c8c7cb262558d /meta/recipes-extended/iputils/files/debian | |
parent | 5f45587b4d9eb763b10da44b3b36971ab809a1cc (diff) | |
download | poky-58ce11215d2928f517c5f96fc85cd0aa6ed9b862.tar.gz |
iputils: update to 20161105
We've been using obsolete upstream URI for quite a while; meanwhile
a lot of development has happened
Drop all the patches: they are either changing the code that has been refactored,
or are backports.
Add a new musl fix patch from gentoo.
ping6 and tracepath6 variants have been folded into standard versions.
(From OE-Core rev: 5997981fa2c22609a88b8cbb595dbf7758b2f7c2)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/iputils/files/debian')
-rw-r--r-- | meta/recipes-extended/iputils/files/debian/targets.diff | 15 | ||||
-rw-r--r-- | meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff | 31 |
2 files changed, 0 insertions, 46 deletions
diff --git a/meta/recipes-extended/iputils/files/debian/targets.diff b/meta/recipes-extended/iputils/files/debian/targets.diff deleted file mode 100644 index 2cb5576c62..0000000000 --- a/meta/recipes-extended/iputils/files/debian/targets.diff +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [disable feature] | ||
2 | |||
3 | Index: iputils-s20121221/Makefile | ||
4 | =================================================================== | ||
5 | --- iputils-s20121221.orig/Makefile | ||
6 | +++ iputils-s20121221/Makefile | ||
7 | @@ -106,7 +106,7 @@ endif | ||
8 | endif | ||
9 | |||
10 | # ------------------------------------- | ||
11 | -IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd | ||
12 | +IPV4_TARGETS=tracepath ping clockdiff arping | ||
13 | IPV6_TARGETS=tracepath6 traceroute6 ping6 | ||
14 | TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS) | ||
15 | |||
diff --git a/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff b/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff deleted file mode 100644 index d3b18868c0..0000000000 --- a/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | Upstream-Status: Pending [from other distro Debian] | ||
2 | |||
3 | Index: iputils-s20121221/tracepath.c | ||
4 | =================================================================== | ||
5 | --- iputils-s20121221.orig/tracepath.c | ||
6 | +++ iputils-s20121221/tracepath.c | ||
7 | @@ -370,9 +370,9 @@ main(int argc, char **argv) | ||
8 | } | ||
9 | #endif | ||
10 | |||
11 | - he = gethostbyname(p); | ||
12 | + he = gethostbyname2(argv[0], AF_INET); | ||
13 | if (he == NULL) { | ||
14 | - herror("gethostbyname"); | ||
15 | + herror("gethostbyname2"); | ||
16 | exit(1); | ||
17 | } | ||
18 | |||
19 | Index: iputils-s20121221/ping.c | ||
20 | =================================================================== | ||
21 | --- iputils-s20121221.orig/ping.c | ||
22 | +++ iputils-s20121221/ping.c | ||
23 | @@ -279,7 +279,7 @@ main(int argc, char **argv) | ||
24 | #else | ||
25 | idn = target; | ||
26 | #endif | ||
27 | - hp = gethostbyname(idn); | ||
28 | + hp = gethostbyname2(idn, AF_INET); | ||
29 | if (!hp) { | ||
30 | fprintf(stderr, "ping: unknown host %s\n", target); | ||
31 | exit(2); | ||