Skip to contentSkip to conversation

package/iputils: bump to version s20190709

PATCH New Petr Vorel 2 participants 2 messages Jul 10, 2019 – Jul 14, 2019 Arm/Amlogic Meson SoC support

lore
Share & tools
lore

Petr Vorel

author
#0 lore raw

PATCH v2 1/1 package/iputils: bump to version s20190709

Remove all patches (accepted in this release).

---
Changes v1->v2:
* Use 20190709 as version (not s20190709, required by Arnout)

Kind regards,
Petr

 ...-ninfod_name.c-fix-build-with-nettle.patch | 38 ---------
 ...atic-build-gcrypt-dependency-gpg-err.patch | 51 ------------
 .../0003-meson.build-fix-build-with-NLS.patch | 77 -------------------
 ...uild-sys-Make-setcap-really-optional.patch | 70 -----------------
 .../0005-traceroute6-fix-build-with-NLS.patch | 30 --------
 package/iputils/iputils.hash                  |  3 +-
 package/iputils/iputils.mk                    |  4 +-
 7 files changed, 4 insertions(+), 269 deletions(-)
 delete mode 100644 package/iputils/0001-ninfod-ninfod_name.c-fix-build-with-nettle.patch
 delete mode 100644 package/iputils/0002-build-sys-fix-static-build-gcrypt-dependency-gpg-err.patch
 delete mode 100644 package/iputils/0003-meson.build-fix-build-with-NLS.patch
 delete mode 100644 package/iputils/0004-build-sys-Make-setcap-really-optional.patch
 delete mode 100644 package/iputils/0005-traceroute6-fix-build-with-NLS.patch
package/iputils/0001-ninfod-ninfod_name.c-fix-build-with-nettle.patch deleted +0 -38
deleted file mode 100644
index 5d522f53ef..0000000000
@@ -1,38 +0,0 @@
-From f209ebb91e65980bcdddce8cc12b00ec11623f76 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Tue, 21 May 2019 19:14:18 +0200
-Subject: [PATCH] ninfod/ninfod_name.c: fix build with nettle
-
-Build of ninfod with nettle fails on:
-/home/test/autobuild/run/instance-1/output/host/bin/mips64el-linux-gcc  -o ninfod/ninfod 'ninfod/0cb6efe@@ninfod at exe/ni_ifaddrs.c.o' 'ninfod/0cb6efe@@ninfod at exe/ninfod.c.o' 'ninfod/0cb6efe@@ninfod at exe/ninfod_addrs.c.o' 'ninfod/0cb6efe@@ninfod at exe/ninfod_core.c.o' 'ninfod/0cb6efe@@ninfod at exe/ninfod_name.c.o' -Wl,--no-undefined -Wl,--as-needed -Wl,-O1 -Wl,--start-group libcommon.a -lcap /home/test/autobuild/run/instance-1/output/host/usr/bin/../mips64el-buildroot-linux-uclibc/sysroot/usr/lib/libnettle.so -Wl,--end-group -pthread '-Wl,-rpath,$ORIGIN/..:/home/test/autobuild/run/instance-1/output/host/usr/bin/../mips64el-buildroot-linux-uclibc/sysroot/usr/lib' -Wl,-rpath-link,/home/test/autobuild/run/instance-1/output/build/iputils-s20190515/build/:/home/test/autobuild/run/instance-1/output/host/usr/bin/../mips64el-buildroot-linux-uclibc/sysroot/usr/lib
-ninfod/0cb6efe@@ninfod at exe/ninfod_name.c.o: In function `init_nodeinfo_nodename':
-ninfod_name.c:(.text+0x378): undefined reference to `MD5_Init'
-
-This error is raised because MD5_Init is not defined by nettle.
-To fix this error, include iputils_md5dig.h if USE_NETTLE is defined.
-
-Fixes:
- - http://autobuild.buildroot.org/results/e86555090e27b631ba35214ef100aa9331844684
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
-Upstream status: commit f209ebb91e65980bcdddce8cc12b00ec11623f76
----
- ninfod/ninfod_name.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ninfod/ninfod_name.c b/ninfod/ninfod_name.c
-index daf606d..525c93d 100644
---- a/ninfod/ninfod_name.c
-+++ b/ninfod/ninfod_name.c
-@@ -95,7 +95,7 @@
- 
- #include <arpa/inet.h>
- 
--#if defined(HAVE_GCRYPT_H) || defined(USE_KERNEL_CRYPTO_API)
-+#if defined(HAVE_GCRYPT_H) || defined(USE_KERNEL_CRYPTO_API) || defined(USE_NETTLE)
- # include "iputils_md5dig.h"
- #elif defined(HAVE_GNUTLS_OPENSSL_H)
- # include <gnutls/openssl.h>
--- 
-2.21.0
-
package/iputils/0002-build-sys-fix-static-build-gcrypt-dependency-gpg-err.patch deleted +0 -51

51 lines not on this page · raw message

package/iputils/0003-meson.build-fix-build-with-NLS.patch deleted +0 -77

77 lines not on this page · raw message

package/iputils/0004-build-sys-Make-setcap-really-optional.patch deleted +0 -70

70 lines not on this page · raw message

package/iputils/0005-traceroute6-fix-build-with-NLS.patch deleted +0 -30
deleted file mode 100644
index 70315c551b..0000000000
@@ -1,30 +0,0 @@
-From b18c6c48e4dabaf8bf9b178b3deca631fc79c96e Mon Sep 17 00:00:00 2001
-From: Petr Vorel <[email protected]>
-Date: Tue, 11 Jun 2019 21:51:58 +0200
-Subject: [PATCH] traceroute6: fix build with NLS
-
-commit 418d8be ("build-sys: fix build with NLS") fixed problems for
-default packages using libintl. Fix also traceroute6 (build it must be
-enabled with -DBUILD_TRACEROUTE6=true)
-
-Signed-off-by: Petr Vorel <[email protected]>
-Upstream status: 81bfb31a714641b70c2a7c7d9ce12cf08f98a372
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 2b545b6..85db8a6 100644
---- a/meson.build
-+++ b/meson.build
-@@ -266,7 +266,7 @@ endif
-
- if build_traceroute6 == true
-	executable('traceroute6', ['traceroute6.c', git_version_h],
--		dependencies : [cap_dep, idn_dep],
-+		dependencies : [cap_dep, intl_dep, idn_dep],
-		link_with : [libcommon],
-		install: true)
-	meson.add_install_script('build-aux/setcap-setuid.sh',
---
-2.21.0
package/iputils/iputils.hash +2 -1
index 0e2963dda2..3630ae8678 100644
@@ -1,5 +1,6 @@
+# https://github.com/iputils/iputils/releases/download/s20190709/sha256sum.asc
+sha256 a15720dd741d7538dd2645f9f516d193636ae4300ff7dbc8bfca757bf166490a  iputils-20190709.tar.gz
 # Locally computed
-sha256 9b5125eb5ef9f4e947ad8fdddcf77f538f53b8f47b53eb5bc5347cb16d01c8fd  iputils-20190515.tar.gz
 sha256 b8ea785d12fa6a44916601104dd746216957e93f13a26d3eb858b3b5a4ad66ab  LICENSE
 sha256 9acc4bc871a4742550158e3696dcb381953172ef808d04ca248184f9f6322712  Documentation/LICENSE.BSD3
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Documentation/LICENSE.GPL2
package/iputils/iputils.mk +2 -2
index 15ee68be53..3c70bea688 100644
@@ -11,8 +11,8 @@
 # and IPv6 updates.
 # http://www.spinics.net/lists/netdev/msg279881.html
 
-IPUTILS_VERSION = 20190515
-IPUTILS_SITE = $(call github,iputils,iputils,s$(IPUTILS_VERSION))
+IPUTILS_VERSION = 20190709
+IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION))
 IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause
 IPUTILS_LICENSE_FILES = LICENSE Documentation/LICENSE.BSD3 Documentation/LICENSE.GPL2
 IPUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
Signature · 1 line
2.20.1
#1 lore raw

PATCH v2 1/1 package/iputils: bump to version s20190709

Hello Petr,

Quoted 6 lines · On Wed, 10 Jul 2019 22:45:29 +0200 Petr Vorel <[email protected]> wrote:

Remove all patches (accepted in this release).

---
Changes v1->v2:
* Use 20190709 as version (not s20190709, required by Arnout)

Unfortunately, this still wasn't correct, and with your patch, iputils cannot be downloaded (unless it was previously downloaded, and available in DL_DIR). See below.

package/iputils/iputils.mk line 15

Quoted 4 lines
package/iputils/iputils.mk +2 -2
-IPUTILS_VERSION = 20190515
-IPUTILS_SITE = $(call github,iputils,iputils,s$(IPUTILS_VERSION))
+IPUTILS_VERSION = 20190709
+IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION))

Your change to _SITE is wrong: you need to keep the 's' prefix, otherwise Buildroot tries to use the 20190709 Git tag, which doesn't exist. We need to use the s20190709 Git tag.

So I've dropped the change to _SITE to keep the "s" prefix and applied.

Thanks!

Thomas

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