summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/iputils/iputils/0001-iputils-Initialize-libgcrypt.patch55
-rw-r--r--meta/recipes-extended/iputils/iputils/0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch51
-rw-r--r--meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch28
-rw-r--r--meta/recipes-extended/iputils/iputils_s20200821.bb (renamed from meta/recipes-extended/iputils/iputils_s20190709.bb)11
4 files changed, 4 insertions, 141 deletions
diff --git a/meta/recipes-extended/iputils/iputils/0001-iputils-Initialize-libgcrypt.patch b/meta/recipes-extended/iputils/iputils/0001-iputils-Initialize-libgcrypt.patch
deleted file mode 100644
index b56804cebe..0000000000
--- a/meta/recipes-extended/iputils/iputils/0001-iputils-Initialize-libgcrypt.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1From 8576e0c218634e6f7ed1b6ff02fa164fb0c75f86 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Wed, 29 Apr 2020 03:50:32 +0000
4Subject: [PATCH] iputils_md5dig.h: Initialize libgcrypt
5
6Initialize libgcrypt on first use otherwise
7there comes below warning when check the status
8of the ninfod.service.
9 # systemctl status ninfod.service
10 * ninfod.service - Respond to IPv6 Node Information Queries
11 Loaded: loaded (/lib/systemd/system/ninfod.service; enabled; vendor preset: enabled)
12 Active: active (running) since Wed 2020-04-29 05:18:21 UTC; 36s ago
13 Docs: man:ninfod(8)
14 Main PID: 347 (ninfod)
15 Tasks: 1 (limit: 9382)
16 Memory: 1.2M
17 CGroup: /system.slice/ninfod.service
18 `-347 /sbin/ninfod -d
19
20 Apr 29 05:18:21 intel-x86-64 systemd[1]: Started Respond to IPv6 Node Information Queries.
21 Apr 29 05:18:24 intel-x86-64 ninfod[347]: Libgcrypt warning: missing initialization - please fix the application
22
23Upstream-Status: Inappropriate [the upstream avoids linking to crypto libraries in
24 commit 214ed83 common: copy md5 implementation to iputils project]
25
26Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
27---
28 iputils_md5dig.h | 9 +++++++++
29 1 file changed, 9 insertions(+)
30
31diff --git a/iputils_md5dig.h b/iputils_md5dig.h
32index bfa7f02..3cc3fbf 100644
33--- a/iputils_md5dig.h
34+++ b/iputils_md5dig.h
35@@ -24,8 +24,17 @@ typedef struct {
36 gcry_md_hd_t dig;
37 } iputils_md5dig_ctx;
38
39+void maybeInit()
40+{
41+ if (!gcry_control(GCRYCTL_INITIALIZATION_FINISHED_P))
42+ {
43+ gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
44+ }
45+}
46+
47 static void iputils_md5dig_init(iputils_md5dig_ctx *ctx)
48 {
49+ maybeInit();
50 if (gcry_md_open(&ctx->dig, GCRY_MD_MD5, 0) != GPG_ERR_NO_ERROR)
51 abort();
52 return;
53--
542.24.1
55
diff --git a/meta/recipes-extended/iputils/iputils/0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch b/meta/recipes-extended/iputils/iputils/0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch
deleted file mode 100644
index e106a0cf73..0000000000
--- a/meta/recipes-extended/iputils/iputils/0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From ab1aa2eb0097a7ef05ffccac058b06812deb2695 Mon Sep 17 00:00:00 2001
2From: Sami Kerola <kerolasa@iki.fi>
3Date: Sat, 28 Dec 2019 17:16:27 +0000
4Subject: [PATCH] ninfod: change variable name to avoid colliding with function
5 name
6
7The sys/capability.h header has 'extern int cap_setuid(uid_t uid);'
8function prototype.
9
10Addresses: https://github.com/iputils/iputils/issues/246
11
12Upstream-Status: Backport [https://github.com/iputils/iputils/commit/18f9a84e0e702841d6cc4d5f593de4fbd1348e83]
13Signed-off-by: Sami Kerola <kerolasa@iki.fi>
14Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
15---
16 ninfod/ninfod.c | 8 ++++----
17 1 file changed, 4 insertions(+), 4 deletions(-)
18
19diff --git a/ninfod/ninfod.c b/ninfod/ninfod.c
20index badbf80..28f03af 100644
21--- a/ninfod/ninfod.c
22+++ b/ninfod/ninfod.c
23@@ -454,7 +454,7 @@ static void do_daemonize(void)
24 /* --------- */
25 #ifdef HAVE_LIBCAP
26 static const cap_value_t cap_net_raw = CAP_NET_RAW;
27-static const cap_value_t cap_setuid = CAP_SETUID;
28+static const cap_value_t cap_setuserid = CAP_SETUID;
29 static cap_flag_value_t cap_ok;
30 #else
31 static uid_t euid;
32@@ -486,7 +486,7 @@ static void limit_capabilities(void)
33
34 cap_get_flag(cap_cur_p, CAP_SETUID, CAP_PERMITTED, &cap_ok);
35 if (cap_ok != CAP_CLEAR)
36- cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid, CAP_SET);
37+ cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuserid, CAP_SET);
38
39 if (cap_set_proc(cap_p) < 0) {
40 DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno));
41@@ -519,8 +519,8 @@ static void drop_capabilities(void)
42
43 /* setuid / setuid */
44 if (cap_ok != CAP_CLEAR) {
45- cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid, CAP_SET);
46- cap_set_flag(cap_p, CAP_EFFECTIVE, 1, &cap_setuid, CAP_SET);
47+ cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuserid, CAP_SET);
48+ cap_set_flag(cap_p, CAP_EFFECTIVE, 1, &cap_setuserid, CAP_SET);
49
50 if (cap_set_proc(cap_p) < 0) {
51 DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno));
diff --git a/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch b/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch
deleted file mode 100644
index 03a3f5602d..0000000000
--- a/meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From c1f1527eb30d4a5feebf9a0757582bbf7fe3eae9 Mon Sep 17 00:00:00 2001
2From: Andrea Stevanato <andrea.stevanato.95@hotmail.it>
3Date: Tue, 5 Nov 2019 19:08:30 +0000
4Subject: [PATCH] ninfod: fix systemd Documentation url error
5
6systemd[1]: /usr/lib/systemd/system/ninfod.service:3: Invalid URL, ignoring: ninfod(8)
7
8Upstream-Status: Backport [https://github.com/iputils/iputils/commit/c1f1527eb30d4a5feebf9a0757582bbf7fe3eae9]
9Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
10---
11 systemd/ninfod.service.in | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/systemd/ninfod.service.in b/systemd/ninfod.service.in
15index 5ab69ca00e96..8e79fcd9238e 100644
16--- a/systemd/ninfod.service.in
17+++ b/systemd/ninfod.service.in
18@@ -1,6 +1,6 @@
19 [Unit]
20 Description=Respond to IPv6 Node Information Queries
21-Documentation=ninfod(8)
22+Documentation=man:ninfod(8)
23 Requires=network.target
24 After=network.target
25
26--
272.17.1
28
diff --git a/meta/recipes-extended/iputils/iputils_s20190709.bb b/meta/recipes-extended/iputils/iputils_s20200821.bb
index 545f3d5e87..87891140e7 100644
--- a/meta/recipes-extended/iputils/iputils_s20190709.bb
+++ b/meta/recipes-extended/iputils/iputils_s20200821.bb
@@ -11,12 +11,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=55aa8c9fcad0691cef0ecd420361e390"
11DEPENDS = "gnutls" 11DEPENDS = "gnutls"
12 12
13SRC_URI = "git://github.com/iputils/iputils \ 13SRC_URI = "git://github.com/iputils/iputils \
14 file://0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch \
15 file://0001-ninfod-fix-systemd-Documentation-url-error.patch \
16 file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \ 14 file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \
17 file://0001-iputils-Initialize-libgcrypt.patch \
18 " 15 "
19SRCREV = "13e00847176aa23683d68fce1d17ffb523510946" 16SRCREV = "23c3782ae0c7f9c6ae59dbed8ad9204f8758542b"
20 17
21S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
22 19
@@ -26,16 +23,16 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>s\d+)"
26# breaks the version order. 23# breaks the version order.
27CVE_CHECK_WHITELIST += "CVE-2000-1213 CVE-2000-1214" 24CVE_CHECK_WHITELIST += "CVE-2000-1213 CVE-2000-1214"
28 25
29PACKAGECONFIG ??= "libcap libgcrypt rarpd \ 26PACKAGECONFIG ??= "libcap rarpd \
30 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod traceroute6', '', d)} \ 27 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod traceroute6', '', d)} \
31 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" 28 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
32PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false, libcap" 29PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false, libcap"
33PACKAGECONFIG[libgcrypt] = "-DUSE_CRYPTO=gcrypt, -DUSE_CRYPTO=none, libgcrypt"
34PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2" 30PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2"
35PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext" 31PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext"
36PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false," 32PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false,"
37PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false," 33PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false,"
38PACKAGECONFIG[systemd] = "-Dsystemdunitdir=${systemd_unitdir}/system,,systemd" 34PACKAGECONFIG[systemd] = "-Dsystemdunitdir=${systemd_unitdir}/system,,systemd"
35PACKAGECONFIG[tftpd] = "-DBUILD_TFTPD=true, -DBUILD_TFTPD=false,"
39PACKAGECONFIG[traceroute6] = "-DBUILD_TRACEROUTE6=true,-DBUILD_TRACEROUTE6=false," 36PACKAGECONFIG[traceroute6] = "-DBUILD_TRACEROUTE6=true,-DBUILD_TRACEROUTE6=false,"
40PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt" 37PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt"
41 38
@@ -63,7 +60,7 @@ FILES_${PN}-arping = "${base_bindir}/arping"
63FILES_${PN}-tracepath = "${base_bindir}/tracepath" 60FILES_${PN}-tracepath = "${base_bindir}/tracepath"
64FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6" 61FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6"
65FILES_${PN}-clockdiff = "${base_bindir}/clockdiff" 62FILES_${PN}-clockdiff = "${base_bindir}/clockdiff"
66FILES_${PN}-tftpd = "${base_bindir}/tftpd" 63FILES_${PN}-tftpd = "${base_bindir}/tftpd ${sysconfdir}/xinetd.d/tftp"
67FILES_${PN}-rarpd = "${base_sbindir}/rarpd ${systemd_unitdir}/system/rarpd@.service" 64FILES_${PN}-rarpd = "${base_sbindir}/rarpd ${systemd_unitdir}/system/rarpd@.service"
68FILES_${PN}-rdisc = "${base_sbindir}/rdisc" 65FILES_${PN}-rdisc = "${base_sbindir}/rdisc"
69FILES_${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh" 66FILES_${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh"