Skip to contentSkip to conversation

iputils: upgrade to s20190709

PATCH In review Changhyeok Bae 2 participants 2 messages Aug 23, 2019 – Aug 26, 2019

lore
Share & tools
lore

Changhyeok Bae

author
#0 lore raw

PATCH 1/1 iputils: upgrade to s20190709

build system is changed to meson.

Signed-off-by Changhyeok Bae <[email protected]>
---
 .../iputils/iputils/ai_canonidn.patch         | 58 ------------------
 .../iputils/iputils/install.patch             | 26 --------
 .../iputils/iputils_s20180629.bb              | 61 -------------------
 .../iputils/iputils_s20190709.bb              | 55 +++++++++++++++++
 4 files changed, 55 insertions(+), 145 deletions(-)
 delete mode 100644 meta/recipes-extended/iputils/iputils/ai_canonidn.patch
 delete mode 100644 meta/recipes-extended/iputils/iputils/install.patch
 delete mode 100644 meta/recipes-extended/iputils/iputils_s20180629.bb
 create mode 100644 meta/recipes-extended/iputils/iputils_s20190709.bb
meta/recipes-extended/iputils/iputils/ai_canonidn.patch deleted +0 -58
deleted file mode 100644
index cd91267b78..0000000000
@@ -1,58 +0,0 @@
-From 714e2b458c151c5bdfe93647445cd00dd8e36fff Mon Sep 17 00:00:00 2001
-From: Petr Vorel <[email protected]>
-Date: Sat, 21 Jul 2018 17:46:14 +0200
-Subject: [PATCH] ping: Fix AI_CANONIDN usage on some systems
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <[email protected]>
-
-Commit 99f67db used AI_CANONIDN in a way, which broke compilation on
-systems where AI_CANONIDN is not defined in netdb.h (e.g. glibc < 2.3.4,
-alternative libcs that don't support IDN: e.g. current musl 1.1.19 and
-uClibc-ng 1.0.30) when not using the system libidn2.
-
-Fixes: 99f67db ping: Fix ping name encoded using ACE on C locale
-
-Reported-by: Nicholas Fish
-Signed-off-by: Petr Vorel <[email protected]>
-
----
- ping.c | 2 +-
- ping.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ping.c b/ping.c
-index 733477f..b241815 100644
---- a/ping.c
-+++ b/ping.c
-@@ -207,9 +207,9 @@ main(int argc, char **argv)
- 
- #ifdef USE_IDN
- 	setlocale(LC_ALL, "");
--#endif
- 	if (!strcmp(setlocale(LC_ALL, NULL), "C"))
- 		hints.ai_flags &= ~ AI_CANONIDN;
-+#endif
- 
- 	/* Support being called using `ping4` or `ping6` symlinks */
- 	if (argv[0][strlen(argv[0])-1] == '4')
-diff --git a/ping.h b/ping.h
-index 3e09685..8a0c4ef 100644
---- a/ping.h
-+++ b/ping.h
-@@ -28,7 +28,6 @@
- #include <netinet/icmp6.h>
- #include <linux/filter.h>
- #include <resolv.h>
--#include <locale.h>
- 
- #ifdef CAPABILITIES
- #include <sys/prctl.h>
-@@ -36,6 +35,7 @@
- #endif
- 
- #ifdef USE_IDN
-+#include <locale.h>
- #include <idn2.h>
- #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN)
- #define getnameinfo_flags NI_IDN
meta/recipes-extended/iputils/iputils/install.patch deleted +0 -26
deleted file mode 100644
index abfefd7a58..0000000000
@@ -1,26 +0,0 @@
-From 5c8c3b04d73304679340f893636e87691992053b Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-Date: Mon, 23 Jul 2018 14:21:03 +0100
-Subject: [PATCH] Add install
-
-Add a simple install rule so that we always install the binaries that were built.
-
-Upstream-Status: Inappropriate
-Signed-off-by: Ross Burton <[email protected]>
-
----
- Makefile | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index 17fc5c9..e0c2784 100644
---- a/Makefile
-+++ b/Makefile
-@@ -231,3 +231,7 @@ rpm:
- 	@$(RPMBUILD) -ta --define 'current yes' $(RPMTMP)/iputils.tar.bz2
- 	@rm -f $(RPMTMP)/iputils.tar.bz2
- 
-+install:
-+	for t in $(TARGETS); do \
-+		install -D $$t $(DESTDIR)$(bindir)/$$t; \
-+	done
meta/recipes-extended/iputils/iputils_s20180629.bb deleted +0 -61

61 lines not on this page · raw message

meta/recipes-extended/iputils/iputils_s20190709.bb new file +55 -0

55 lines not on this page · raw message

Signature · 1 line
2.23.0