summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/iputils/iputils
diff options
context:
space:
mode:
authorChanghyeok Bae <changhyeok.bae@gmail.com>2019-08-23 23:56:53 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-28 11:31:21 +0100
commit0abaeab83fc8b7967b93a9ff89a0947bf4b95129 (patch)
treed47493e0d1e06bca1000a7a9c71ffc3b59b31d08 /meta/recipes-extended/iputils/iputils
parent99e652fa88116929ed1d5ed44eb7d27fac6fea77 (diff)
downloadpoky-0abaeab83fc8b7967b93a9ff89a0947bf4b95129.tar.gz
iputils: upgrade to s20190709
build system is changed to meson. (From OE-Core rev: 3d2085642a8b4058ded6ab0c426feefc097f85c1) Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/iputils/iputils')
-rw-r--r--meta/recipes-extended/iputils/iputils/ai_canonidn.patch58
-rw-r--r--meta/recipes-extended/iputils/iputils/install.patch26
2 files changed, 0 insertions, 84 deletions
diff --git a/meta/recipes-extended/iputils/iputils/ai_canonidn.patch b/meta/recipes-extended/iputils/iputils/ai_canonidn.patch
deleted file mode 100644
index cd91267b78..0000000000
--- a/meta/recipes-extended/iputils/iputils/ai_canonidn.patch
+++ /dev/null
@@ -1,58 +0,0 @@
1From 714e2b458c151c5bdfe93647445cd00dd8e36fff Mon Sep 17 00:00:00 2001
2From: Petr Vorel <petr.vorel@gmail.com>
3Date: Sat, 21 Jul 2018 17:46:14 +0200
4Subject: [PATCH] ping: Fix AI_CANONIDN usage on some systems
5
6Upstream-Status: Backport
7Signed-off-by: Ross Burton <ross.burton@intel.com>
8
9Commit 99f67db used AI_CANONIDN in a way, which broke compilation on
10systems where AI_CANONIDN is not defined in netdb.h (e.g. glibc < 2.3.4,
11alternative libcs that don't support IDN: e.g. current musl 1.1.19 and
12uClibc-ng 1.0.30) when not using the system libidn2.
13
14Fixes: 99f67db ping: Fix ping name encoded using ACE on C locale
15
16Reported-by: Nicholas Fish
17Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
18
19---
20 ping.c | 2 +-
21 ping.h | 2 +-
22 2 files changed, 2 insertions(+), 2 deletions(-)
23
24diff --git a/ping.c b/ping.c
25index 733477f..b241815 100644
26--- a/ping.c
27+++ b/ping.c
28@@ -207,9 +207,9 @@ main(int argc, char **argv)
29
30 #ifdef USE_IDN
31 setlocale(LC_ALL, "");
32-#endif
33 if (!strcmp(setlocale(LC_ALL, NULL), "C"))
34 hints.ai_flags &= ~ AI_CANONIDN;
35+#endif
36
37 /* Support being called using `ping4` or `ping6` symlinks */
38 if (argv[0][strlen(argv[0])-1] == '4')
39diff --git a/ping.h b/ping.h
40index 3e09685..8a0c4ef 100644
41--- a/ping.h
42+++ b/ping.h
43@@ -28,7 +28,6 @@
44 #include <netinet/icmp6.h>
45 #include <linux/filter.h>
46 #include <resolv.h>
47-#include <locale.h>
48
49 #ifdef CAPABILITIES
50 #include <sys/prctl.h>
51@@ -36,6 +35,7 @@
52 #endif
53
54 #ifdef USE_IDN
55+#include <locale.h>
56 #include <idn2.h>
57 #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN)
58 #define getnameinfo_flags NI_IDN
diff --git a/meta/recipes-extended/iputils/iputils/install.patch b/meta/recipes-extended/iputils/iputils/install.patch
deleted file mode 100644
index abfefd7a58..0000000000
--- a/meta/recipes-extended/iputils/iputils/install.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From 5c8c3b04d73304679340f893636e87691992053b Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross@burtonini.com>
3Date: Mon, 23 Jul 2018 14:21:03 +0100
4Subject: [PATCH] Add install
5
6Add a simple install rule so that we always install the binaries that were built.
7
8Upstream-Status: Inappropriate
9Signed-off-by: Ross Burton <ross.burton@intel.com>
10
11---
12 Makefile | 4 ++++
13 1 file changed, 4 insertions(+)
14
15diff --git a/Makefile b/Makefile
16index 17fc5c9..e0c2784 100644
17--- a/Makefile
18+++ b/Makefile
19@@ -231,3 +231,7 @@ rpm:
20 @$(RPMBUILD) -ta --define 'current yes' $(RPMTMP)/iputils.tar.bz2
21 @rm -f $(RPMTMP)/iputils.tar.bz2
22
23+install:
24+ for t in $(TARGETS); do \
25+ install -D $$t $(DESTDIR)$(bindir)/$$t; \
26+ done