Skip to contentSkip to conversation

iputils: Bump to version s20190324

PATCH New Petr Vorel 2 participants 3 messages May 9, 2019 – May 16, 2019

lore
Share & tools
lore

Petr Vorel

author
#0 lore raw

PATCH v2 1/1 iputils: Bump to version 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).

* backport commits
- f65b38b ("ping6_common.c: include stddef.h"): build error fix
- 784a67c ("build-sys: make setcap-setuid.sh respect ${DESTDIR}":
fix setcap-setuid.sh for cross compilation

Removed patch included in this release.

Build ninfod if possible (when use any crypto).

---
NOTE: there are other valuable upstream fixes for users, but I used only these needed to fix build (1) I guess that's a buildroot policy 2) I hope bugfix upstream release happens in reasonable time.

Kind regards,
Petr

 ...ix-AI_CANONIDN-usage-on-some-systems.patch | 57 ------------------
 ...0001-ping6_common.c-include-stddef.h.patch | 25 ++++++++
 ...ake-setcap-setuid.sh-respect-DESTDIR.patch | 28 +++++++++
 package/iputils/iputils.hash                  |  2 +-
 package/iputils/iputils.mk                    | 58 +++++--------------
 5 files changed, 70 insertions(+), 100 deletions(-)
 delete mode 100644 package/iputils/0001-ping-Fix-AI_CANONIDN-usage-on-some-systems.patch
 create mode 100644 package/iputils/0001-ping6_common.c-include-stddef.h.patch
 create mode 100644 package/iputils/0002-build-sys-make-setcap-setuid.sh-respect-DESTDIR.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/0001-ping6_common.c-include-stddef.h.patch new file +25 -0
new file mode 100644
index 0000000000..edc8866c31
@@ -0,0 +1,25 @@
+From f65b38b9317e1298cfc5877b0eed7c7badbe597a Mon Sep 17 00:00:00 2001
+From: Mikhail Efremov <[email protected]>
+Date: Mon, 25 Mar 2019 21:41:36 +0300
+Subject: [PATCH] ping6_common.c: include stddef.h
+
+Requird by offsetof().
+---
+ ping6_common.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ping6_common.c b/ping6_common.c
+index 4989e00..8115106 100644
+--- a/ping6_common.c
++++ b/ping6_common.c
+@@ -57,6 +57,7 @@
+  *	if -N option is used, this program has to run SUID to ROOT or
+  *	with net_cap_raw enabled.
+  */
++#include <stddef.h>
+ #include "iputils_common.h"
+ #include "iputils_ni.h"
+ #include "ping.h"
+-- 
+2.21.0
+
package/iputils/0002-build-sys-make-setcap-setuid.sh-respect-DESTDIR.patch new file +28 -0
new file mode 100644
index 0000000000..5f2104ce27
@@ -0,0 +1,28 @@
+From 784a67cb339cc43db86a676de00b51cb4101d1d6 Mon Sep 17 00:00:00 2001
+From: Arfrever Frehtes Taifersar Arahesis <[email protected]>
+Date: Mon, 1 Apr 2019 00:30:20 +0000
+Subject: [PATCH] build-sys: make setcap-setuid.sh respect ${DESTDIR}
+
+Reference: https://github.com/iputils/iputils/issues/175
+---
+ build-aux/setcap-setuid.sh | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/build-aux/setcap-setuid.sh b/build-aux/setcap-setuid.sh
+index f317a22..f832978 100755
+--- a/build-aux/setcap-setuid.sh
++++ b/build-aux/setcap-setuid.sh
+@@ -6,6 +6,10 @@ exec_path="$1/$2"
+ perm_type="$3"
+ setcap="$4"
+ 
++if [ -n "${DESTDIR}" ]; then
++	exec_path="${DESTDIR%/}/${exec_path}"
++fi
++
+ case "$perm_type" in
+ 	'caps')
+ 		echo "$0: calling: $setcap cap_net_raw+ep $exec_path"
+-- 
+2.21.0
+
package/iputils/iputils.hash +1 -1
index 14e2c67134..d74d3c7d76 100644
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 da14105291dd491f28ea91ade854ed10aee8ba019641c80eed233de3908be7c5  iputils-s20180629.tar.gz
+sha256 b1d4b6e6dc7f011b1463722e6ac4c676d2e6146f49e784ac607fa3106fd277d3  iputils-s20190324.tar.gz
 sha256 966075293e45785230c19415bcda15bd07c75bead4fe73332d1a4b9c45bb321f  ninfod/COPYING
package/iputils/iputils.mk +16 -42

77 lines not on this page · raw message

Signature · 1 line
2.21.0
#1 lore raw

PATCH v2 1/1 iputils: Bump to version s20190324

Hello Petr,

Quoted 11 lines · On Fri, 10 May 2019 00:45:08 +0200 Petr Vorel <[email protected]> wrote:

Upstream changed build system to Meson, these extra changes were required:

* remove custom commands of previous build system (IPUTILS_INSTALL_TARGET_CMDS, IPUTILS_PERMISSIONS).

* backport commits
- f65b38b ("ping6_common.c: include stddef.h"): build error fix
- 784a67c ("build-sys: make setcap-setuid.sh respect ${DESTDIR}":
fix setcap-setuid.sh for cross compilation

Quoted 5 lines

Removed patch included in this release.

Build ninfod if possible (when use any crypto).

It looks mostly good, but I have a few nits and questions.

First, the commit should be prefixed by "package/iputils", not just "iputils", and "Bump" should be "bump", i.e lowercase. This of course I had fixed locally, but I had more nits/questions, so I couldn't apply as-is.

package/iputils/0001-ping6_common.c-include-stddef.h.patch line 6

Quoted 12 lines
package/iputils/0001-ping6_common.c-include-stddef.h.patch new file +6 -0
new file mode 100644
index 0000000000..edc8866c31
@@ -0,0 +1,25 @@
+From f65b38b9317e1298cfc5877b0eed7c7badbe597a Mon Sep 17 00:00:00 2001
+From: Mikhail Efremov <[email protected]>
+Date: Mon, 25 Mar 2019 21:41:36 +0300
+Subject: [PATCH] ping6_common.c: include stddef.h
+
+Requird by offsetof().

We need your Signed-off-by here, and a reference to the upstream commit.

package/iputils/0002-build-sys-make-setcap-setuid.sh-respect-DESTDIR.patch line 6

Quoted 12 lines
package/iputils/0002-build-sys-make-setcap-setuid.sh-respect-DESTDIR.patch new file +6 -0
new file mode 100644
index 0000000000..5f2104ce27
@@ -0,0 +1,28 @@
+From 784a67cb339cc43db86a676de00b51cb4101d1d6 Mon Sep 17 00:00:00 2001
+From: Arfrever Frehtes Taifersar Arahesis <[email protected]>
+Date: Mon, 1 Apr 2019 00:30:20 +0000
+Subject: [PATCH] build-sys: make setcap-setuid.sh respect ${DESTDIR}
+
+Reference: https://github.com/iputils/iputils/issues/175

We need your Signed-off-by here. If the commit is merged upstream, a reference to the upstream commit would be better than a reference to a Github issue.

Quoted 1 line

-IPUTILS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) USE_SYSFS=no USE_IDN=no\

So the USE_SYSFS=no and USE_IDN=no are no longer needed / no longer exist ?

Thomas

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

PATCH v2 1/1 iputils: Bump to version s20190324

Hi Thomas,

Quoted 4 lines

It looks mostly good, but I have a few nits and questions.

First, the commit should be prefixed by "package/iputils", not just "iputils", and "Bump" should be "bump", i.e lowercase.

Thanks for pointing out buildroot preference (I always wondered whether use 'packages/' prefix; lowercase after colon is much preferred generally, but I've seen often upercase, so I adapt to it).

Quoted 3 lines

This of course I
had fixed locally, but I had more nits/questions, so I couldn't apply as-is.

...

Quoted 4 lines
Quoted 1 line

-IPUTILS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) USE_SYSFS=no USE_IDN=no\

So the USE_SYSFS=no and USE_IDN=no are no longer needed / no longer exist ?

Thanks for review, sorry for silly errors.
I've fixed all questions in v3 (using new release I didn't need to backport build fixes).

Kind regards,
Petr