Skip to contentSkip to conversation

package/iputils: bump to version s20190515

PATCH In review Petr Vorel 4 participants 5 messages May 19, 2019 – May 22, 2019

lore
Share & tools
lore

Petr Vorel

author
#0 lore raw

PATCH v4 1/1 package/iputils: bump to version s20190515

This commit also include changes from s20190324.

Upstream changed build system to Meson, these extra changes were required:
* remove custom commands of previous build system:
(IPUTILS_INSTALL_TARGET_CMDS, IPUTILS_PERMISSIONS)
* remove USE_SYSFS=no (support removed from upstream
* transform options from USE_FOO={yes,no} to -DUSE_FOO={true,false}

Removed patch included in this release

Build ninfod if possible (when use any crypto)

---
Changes v3->v4:
* fixed build on systems without Docbook Stylesheets

Hi Thomas,

now tested, without Docbook Stylesheets):
./utils/test-pkg -p iputils

                             br-arm-full [1/6]: OK
                  br-arm-cortex-a9-glibc [2/6]: OK
                   br-arm-cortex-m4-full [3/6]: SKIPPED
                          br-x86-64-musl [4/6]: OK
                      br-arm-full-static [5/6]: OK
                            sourcery-arm [6/6]: OK

6 builds, 1 skipped, 0 build failed, 0 legal-info failed

Kind regards,
Petr

---
 ...ix-AI_CANONIDN-usage-on-some-systems.patch | 57 ------------------
 package/iputils/iputils.hash                  |  2 +-
 package/iputils/iputils.mk                    | 60 +++++++------------
 3 files changed, 23 insertions(+), 96 deletions(-)
 delete mode 100644 package/iputils/0001-ping-Fix-AI_CANONIDN-usage-on-some-systems.patch
package/iputils/0001-ping-Fix-AI_CANONIDN-usage-on-some-systems.patch deleted +0 -57
deleted file mode 100644
index 556d3786fb..0000000000
@@ -1,57 +0,0 @@
-From 25899e849aa3abc1ad29ebf0b830262a859eaed5 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
-
-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
--- 
-2.19.0.rc2
-
package/iputils/iputils.hash +1 -1
index 14e2c67134..57b9ccf6a4 100644
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 da14105291dd491f28ea91ade854ed10aee8ba019641c80eed233de3908be7c5  iputils-s20180629.tar.gz
+sha256 9b5125eb5ef9f4e947ad8fdddcf77f538f53b8f47b53eb5bc5347cb16d01c8fd  iputils-s20190515.tar.gz
 sha256 966075293e45785230c19415bcda15bd07c75bead4fe73332d1a4b9c45bb321f  ninfod/COPYING
package/iputils/iputils.mk +22 -38

83 lines not on this page · raw message

Signature · 1 line
2.21.0
#1 lore raw

PATCH v4 1/1 package/iputils: bump to version s20190515

Quoted 9 lines · On Sun, 19 May 2019 23:15:04 +0200 Petr Vorel <[email protected]> wrote:

This commit also include changes from s20190324.

Upstream changed build system to Meson, these extra changes were required:
* remove custom commands of previous build system:
(IPUTILS_INSTALL_TARGET_CMDS, IPUTILS_PERMISSIONS)
* remove USE_SYSFS=no (support removed from upstream
* transform options from USE_FOO={yes,no} to -DUSE_FOO={true,false}

Quoted 8 lines

Removed patch included in this release

Build ninfod if possible (when use any crypto)

---
Changes v3->v4:
* fixed build on systems without Docbook Stylesheets

Applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH v4 1/1 package/iputils: bump to version s20190515

Petr,

Quoted 13 lines · Thomas Petazzoni
Quoted 9 lines · On Sun, 19 May 2019 23:15:04 +0200 Petr Vorel <[email protected]> wrote:

This commit also include changes from s20190324.

Upstream changed build system to Meson, these extra changes were required:
* remove custom commands of previous build system:
(IPUTILS_INSTALL_TARGET_CMDS, IPUTILS_PERMISSIONS)
* remove USE_SYSFS=no (support removed from upstream
* transform options from USE_FOO={yes,no} to -DUSE_FOO={true,false}

Quoted 5 lines
Quoted 5 lines

Removed patch included in this release

Build ninfod if possible (when use any crypto)

Would you mind taking a look at a build failure from this patch?
http://autobuild.buildroot.net/results/f78ac0d3c9a679a584bd54ac7f908390f5a4087b/

Quoted 15 lines
Quoted 3 lines

---
Changes v3->v4:
* fixed build on systems without Docbook Stylesheets

Applied to next, thanks.

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 23 lines
Matthew Weber | Pr. Software Engineer | Commercial Avionics

COLLINS AEROSPACE

400 Collins Road NE, Cedar Rapids, Iowa 52498, USA

Tel: +1 319 295 7349 | FAX: +1 319 263 6099

matthew.weber at collins.com | collinsaerospace.com



CONFIDENTIALITY WARNING: This message may contain proprietary and/or
privileged information of Collins Aerospace and its affiliated
companies. If you are not the intended recipient, please 1) Do not
disclose, copy, distribute or use this message or its contents. 2)
Advise the sender by return email. 3) Delete all copies (including all
attachments) from your computer. Your cooperation is greatly
appreciated.


Any export restricted material should be shared using my
matthew.weber at corp.rockwellcollins.com address.
#4 lore raw

Petr,

Quoted 7 lines · Petr Vorel

Hi Matthew,

Quoted 1 line

Petr,

I already acked proposed fix made by Fabrice

Cool!