All of lore.kernel.org
 help / color / mirror / Atom feed
* [OE-Core][PATCH 1/2] iw: upgrade 5.4 -> 5.8
@ 2020-08-31  9:59 Changhyeok Bae
  2020-08-31  9:59 ` [OE-Core][PATCH 2/2] iputils: upgrade s20190709 -> s20200821 Changhyeok Bae
  0 siblings, 1 reply; 5+ messages in thread
From: Changhyeok Bae @ 2020-08-31  9:59 UTC (permalink / raw)
  To: openembedded-core; +Cc: Changhyeok Bae

Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>
---
 meta/recipes-connectivity/iw/{iw_5.4.bb => iw_5.8.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-connectivity/iw/{iw_5.4.bb => iw_5.8.bb} (85%)

diff --git a/meta/recipes-connectivity/iw/iw_5.4.bb b/meta/recipes-connectivity/iw/iw_5.8.bb
similarity index 85%
rename from meta/recipes-connectivity/iw/iw_5.4.bb
rename to meta/recipes-connectivity/iw/iw_5.8.bb
index 9f58e49709..97ca66d66f 100644
--- a/meta/recipes-connectivity/iw/iw_5.4.bb
+++ b/meta/recipes-connectivity/iw/iw_5.8.bb
@@ -14,8 +14,8 @@ SRC_URI = "http://www.kernel.org/pub/software/network/iw/${BP}.tar.gz \
            file://separate-objdir.patch \
 "
 
-SRC_URI[md5sum] = "08a4f581a39dc62fa85d3af796d844b6"
-SRC_URI[sha256sum] = "943cd2446a6c7242fded3766d054ab2a214a3514b9a8b7e942fed8fb13c1370c"
+SRC_URI[md5sum] = "98129d64212bdbb408f009c56ed5c62a"
+SRC_URI[sha256sum] = "cd9125c7e560926d66b09977fe0f75e5365ffd05a15df67d86a421dc76f96a96"
 
 inherit pkgconfig
 
-- 
2.23.0


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [OE-Core][PATCH 2/2] iputils: upgrade s20190709 -> s20200821
  2020-08-31  9:59 [OE-Core][PATCH 1/2] iw: upgrade 5.4 -> 5.8 Changhyeok Bae
@ 2020-08-31  9:59 ` Changhyeok Bae
  2020-09-01 12:32   ` Richard Purdie
  0 siblings, 1 reply; 5+ messages in thread
From: Changhyeok Bae @ 2020-08-31  9:59 UTC (permalink / raw)
  To: openembedded-core; +Cc: Changhyeok Bae

- libgcrypt is not required anymore because the md5 implementation was
  part of this project.
- ninfod patches are upstreamed and other patch is not required anymore.

Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>
---
 .../0001-iputils-Initialize-libgcrypt.patch   | 55 -------------------
 ...riable-name-to-avoid-colliding-with-.patch | 51 -----------------
 ...-fix-systemd-Documentation-url-error.patch | 28 ----------
 ...tils_s20190709.bb => iputils_s20200821.bb} |  8 +--
 4 files changed, 2 insertions(+), 140 deletions(-)
 delete mode 100644 meta/recipes-extended/iputils/iputils/0001-iputils-Initialize-libgcrypt.patch
 delete mode 100644 meta/recipes-extended/iputils/iputils/0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch
 delete mode 100644 meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch
 rename meta/recipes-extended/iputils/{iputils_s20190709.bb => iputils_s20200821.bb} (87%)

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 @@
-From 8576e0c218634e6f7ed1b6ff02fa164fb0c75f86 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Wed, 29 Apr 2020 03:50:32 +0000
-Subject: [PATCH] iputils_md5dig.h: Initialize libgcrypt
-
-Initialize libgcrypt on first use otherwise
-there comes below warning when check the status
-of the ninfod.service.
- # systemctl status ninfod.service
- * ninfod.service - Respond to IPv6 Node Information Queries
- Loaded: loaded (/lib/systemd/system/ninfod.service; enabled; vendor preset: enabled)
- Active: active (running) since Wed 2020-04-29 05:18:21 UTC; 36s ago
- Docs: man:ninfod(8)
- Main PID: 347 (ninfod)
- Tasks: 1 (limit: 9382)
- Memory: 1.2M
- CGroup: /system.slice/ninfod.service
- `-347 /sbin/ninfod -d
-
- Apr 29 05:18:21 intel-x86-64 systemd[1]: Started Respond to IPv6 Node Information Queries.
- Apr 29 05:18:24 intel-x86-64 ninfod[347]: Libgcrypt warning: missing initialization - please fix the application
-
-Upstream-Status: Inappropriate [the upstream avoids linking to crypto libraries in
-                   commit 214ed83 common: copy md5 implementation to iputils project]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- iputils_md5dig.h | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/iputils_md5dig.h b/iputils_md5dig.h
-index bfa7f02..3cc3fbf 100644
---- a/iputils_md5dig.h
-+++ b/iputils_md5dig.h
-@@ -24,8 +24,17 @@ typedef struct {
- 	gcry_md_hd_t dig;
- } iputils_md5dig_ctx;
- 
-+void maybeInit()
-+{
-+	if (!gcry_control(GCRYCTL_INITIALIZATION_FINISHED_P))
-+	{
-+		gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
-+	}
-+}
-+
- static void iputils_md5dig_init(iputils_md5dig_ctx *ctx)
- {
-+	maybeInit();
- 	if (gcry_md_open(&ctx->dig, GCRY_MD_MD5, 0) != GPG_ERR_NO_ERROR)
- 		abort();
- 	return;
--- 
-2.24.1
-
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 @@
-From ab1aa2eb0097a7ef05ffccac058b06812deb2695 Mon Sep 17 00:00:00 2001
-From: Sami Kerola <kerolasa@iki.fi>
-Date: Sat, 28 Dec 2019 17:16:27 +0000
-Subject: [PATCH] ninfod: change variable name to avoid colliding with function
- name
-
-The sys/capability.h header has 'extern int cap_setuid(uid_t uid);'
-function prototype.
-
-Addresses: https://github.com/iputils/iputils/issues/246
-
-Upstream-Status: Backport [https://github.com/iputils/iputils/commit/18f9a84e0e702841d6cc4d5f593de4fbd1348e83]
-Signed-off-by: Sami Kerola <kerolasa@iki.fi>
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- ninfod/ninfod.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/ninfod/ninfod.c b/ninfod/ninfod.c
-index badbf80..28f03af 100644
---- a/ninfod/ninfod.c
-+++ b/ninfod/ninfod.c
-@@ -454,7 +454,7 @@ static void do_daemonize(void)
- /* --------- */
- #ifdef HAVE_LIBCAP
- static const cap_value_t cap_net_raw = CAP_NET_RAW;
--static const cap_value_t cap_setuid =  CAP_SETUID; 
-+static const cap_value_t cap_setuserid = CAP_SETUID;
- static cap_flag_value_t cap_ok;
- #else
- static uid_t euid;
-@@ -486,7 +486,7 @@ static void limit_capabilities(void)
- 
- 	cap_get_flag(cap_cur_p, CAP_SETUID, CAP_PERMITTED, &cap_ok);
- 	if (cap_ok != CAP_CLEAR)
--		cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid, CAP_SET);
-+		cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuserid, CAP_SET);
- 
- 	if (cap_set_proc(cap_p) < 0) {
- 		DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno));
-@@ -519,8 +519,8 @@ static void drop_capabilities(void)
- 
- 	/* setuid / setuid */
- 	if (cap_ok != CAP_CLEAR) {
--		cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid, CAP_SET);
--		cap_set_flag(cap_p, CAP_EFFECTIVE, 1, &cap_setuid, CAP_SET);
-+		cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuserid, CAP_SET);
-+		cap_set_flag(cap_p, CAP_EFFECTIVE, 1, &cap_setuserid, CAP_SET);
- 
- 		if (cap_set_proc(cap_p) < 0) {
- 			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 @@
-From c1f1527eb30d4a5feebf9a0757582bbf7fe3eae9 Mon Sep 17 00:00:00 2001
-From: Andrea Stevanato <andrea.stevanato.95@hotmail.it>
-Date: Tue, 5 Nov 2019 19:08:30 +0000
-Subject: [PATCH] ninfod: fix systemd Documentation url error
-
-systemd[1]: /usr/lib/systemd/system/ninfod.service:3: Invalid URL, ignoring: ninfod(8)
-
-Upstream-Status: Backport [https://github.com/iputils/iputils/commit/c1f1527eb30d4a5feebf9a0757582bbf7fe3eae9]
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
----
- systemd/ninfod.service.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/systemd/ninfod.service.in b/systemd/ninfod.service.in
-index 5ab69ca00e96..8e79fcd9238e 100644
---- a/systemd/ninfod.service.in
-+++ b/systemd/ninfod.service.in
-@@ -1,6 +1,6 @@
- [Unit]
- Description=Respond to IPv6 Node Information Queries
--Documentation=ninfod(8)
-+Documentation=man:ninfod(8)
- Requires=network.target
- After=network.target
- 
--- 
-2.17.1
-
diff --git a/meta/recipes-extended/iputils/iputils_s20190709.bb b/meta/recipes-extended/iputils/iputils_s20200821.bb
similarity index 87%
rename from meta/recipes-extended/iputils/iputils_s20190709.bb
rename to meta/recipes-extended/iputils/iputils_s20200821.bb
index 545f3d5e87..62d6a3c209 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"
 DEPENDS = "gnutls"
 
 SRC_URI = "git://github.com/iputils/iputils \
-           file://0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch \
-           file://0001-ninfod-fix-systemd-Documentation-url-error.patch \
            file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \
-           file://0001-iputils-Initialize-libgcrypt.patch \
            "
-SRCREV = "13e00847176aa23683d68fce1d17ffb523510946"
+SRCREV = "23c3782ae0c7f9c6ae59dbed8ad9204f8758542b"
 
 S = "${WORKDIR}/git"
 
@@ -26,11 +23,10 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>s\d+)"
 # breaks the version order.
 CVE_CHECK_WHITELIST += "CVE-2000-1213 CVE-2000-1214"
 
-PACKAGECONFIG ??= "libcap libgcrypt rarpd \
+PACKAGECONFIG ??= "libcap rarpd \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod traceroute6', '', d)} \
                    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false, libcap"
-PACKAGECONFIG[libgcrypt] = "-DUSE_CRYPTO=gcrypt, -DUSE_CRYPTO=none, libgcrypt"
 PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2"
 PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext"
 PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false,"
-- 
2.23.0


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [OE-Core][PATCH 2/2] iputils: upgrade s20190709 -> s20200821
  2020-08-31  9:59 ` [OE-Core][PATCH 2/2] iputils: upgrade s20190709 -> s20200821 Changhyeok Bae
@ 2020-09-01 12:32   ` Richard Purdie
  2020-09-01 20:14     ` Changhyeok Bae
  0 siblings, 1 reply; 5+ messages in thread
From: Richard Purdie @ 2020-09-01 12:32 UTC (permalink / raw)
  To: Changhyeok Bae, openembedded-core

On Mon, 2020-08-31 at 11:59 +0200, Changhyeok Bae wrote:
> - libgcrypt is not required anymore because the md5 implementation was
>   part of this project.
> - ninfod patches are upstreamed and other patch is not required anymore.
> 
> Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>
> ---
>  .../0001-iputils-Initialize-libgcrypt.patch   | 55 -------------------
>  ...riable-name-to-avoid-colliding-with-.patch | 51 -----------------
>  ...-fix-systemd-Documentation-url-error.patch | 28 ----------
>  ...tils_s20190709.bb => iputils_s20200821.bb} |  8 +--
>  4 files changed, 2 insertions(+), 140 deletions(-)
>  delete mode 100644 meta/recipes-extended/iputils/iputils/0001-iputils-Initialize-libgcrypt.patch
>  delete mode 100644 meta/recipes-extended/iputils/iputils/0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch
>  delete mode 100644 meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch
>  rename meta/recipes-extended/iputils/{iputils_s20190709.bb => iputils_s20200821.bb} (87%)

Hi,

Thanks for the upgrade. There seems to be an issue with tftpd:

https://autobuilder.yoctoproject.org/typhoon/#/builders/75/builds/2389

Error: 
 Problem: package packagegroup-core-full-cmdline-1.0-r6.noarch requires packagegroup-core-full-cmdline-extended, but none of the providers can be installed
  - package packagegroup-core-full-cmdline-extended-1.0-r6.noarch requires iputils, but none of the providers can be installed
  - conflicting requests
  - nothing provides iputils-tftpd needed by iputils-s20200821-r0.core2_32
(try to add '--skip-broken' to skip uninstallable packages)

Any ideas what changed?

Cheers,

Richard


^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [OE-Core][PATCH 2/2] iputils: upgrade s20190709 -> s20200821
  2020-09-01 12:32   ` Richard Purdie
@ 2020-09-01 20:14     ` Changhyeok Bae
  2020-09-01 20:48       ` Alexander Kanavin
  0 siblings, 1 reply; 5+ messages in thread
From: Changhyeok Bae @ 2020-09-01 20:14 UTC (permalink / raw)
  To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer

[-- Attachment #1: Type: text/plain, Size: 2039 bytes --]

Hi Richard

Thank you for the report. I will look into it.

Best regards,
Changhyeok

2020년 9월 1일 (화) 오후 2:32, Richard Purdie <richard.purdie@linuxfoundation.org>님이
작성:

> On Mon, 2020-08-31 at 11:59 +0200, Changhyeok Bae wrote:
> > - libgcrypt is not required anymore because the md5 implementation was
> >   part of this project.
> > - ninfod patches are upstreamed and other patch is not required anymore.
> >
> > Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>
> > ---
> >  .../0001-iputils-Initialize-libgcrypt.patch   | 55 -------------------
> >  ...riable-name-to-avoid-colliding-with-.patch | 51 -----------------
> >  ...-fix-systemd-Documentation-url-error.patch | 28 ----------
> >  ...tils_s20190709.bb => iputils_s20200821.bb} |  8 +--
> >  4 files changed, 2 insertions(+), 140 deletions(-)
> >  delete mode 100644
> meta/recipes-extended/iputils/iputils/0001-iputils-Initialize-libgcrypt.patch
> >  delete mode 100644
> meta/recipes-extended/iputils/iputils/0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch
> >  delete mode 100644
> meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch
> >  rename meta/recipes-extended/iputils/{iputils_s20190709.bb =>
> iputils_s20200821.bb} (87%)
>
> Hi,
>
> Thanks for the upgrade. There seems to be an issue with tftpd:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/75/builds/2389
>
> Error:
>  Problem: package packagegroup-core-full-cmdline-1.0-r6.noarch requires
> packagegroup-core-full-cmdline-extended, but none of the providers can be
> installed
>   - package packagegroup-core-full-cmdline-extended-1.0-r6.noarch requires
> iputils, but none of the providers can be installed
>   - conflicting requests
>   - nothing provides iputils-tftpd needed by iputils-s20200821-r0.core2_32
> (try to add '--skip-broken' to skip uninstallable packages)
>
> Any ideas what changed?
>
> Cheers,
>
> Richard
>
>

-- 
Thanks
Changhyeok

[-- Attachment #2: Type: text/html, Size: 3103 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [OE-Core][PATCH 2/2] iputils: upgrade s20190709 -> s20200821
  2020-09-01 20:14     ` Changhyeok Bae
@ 2020-09-01 20:48       ` Alexander Kanavin
  0 siblings, 0 replies; 5+ messages in thread
From: Alexander Kanavin @ 2020-09-01 20:48 UTC (permalink / raw)
  To: Changhyeok Bae
  Cc: Richard Purdie, Patches and discussions about the oe-core layer

[-- Attachment #1: Type: text/plain, Size: 2380 bytes --]

I think tftpd option is now off by default, and we probably should disable
it as well:

https://github.com/iputils/iputils/commit/737d8a91e394518d2ccdaf398bb16283eb8e4a81

Alex

On Tue, 1 Sep 2020 at 22:14, Changhyeok Bae <changhyeok.bae@gmail.com>
wrote:

> Hi Richard
>
> Thank you for the report. I will look into it.
>
> Best regards,
> Changhyeok
>
> 2020년 9월 1일 (화) 오후 2:32, Richard Purdie <
> richard.purdie@linuxfoundation.org>님이 작성:
>
>> On Mon, 2020-08-31 at 11:59 +0200, Changhyeok Bae wrote:
>> > - libgcrypt is not required anymore because the md5 implementation was
>> >   part of this project.
>> > - ninfod patches are upstreamed and other patch is not required anymore.
>> >
>> > Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>
>> > ---
>> >  .../0001-iputils-Initialize-libgcrypt.patch   | 55 -------------------
>> >  ...riable-name-to-avoid-colliding-with-.patch | 51 -----------------
>> >  ...-fix-systemd-Documentation-url-error.patch | 28 ----------
>> >  ...tils_s20190709.bb => iputils_s20200821.bb} |  8 +--
>> >  4 files changed, 2 insertions(+), 140 deletions(-)
>> >  delete mode 100644
>> meta/recipes-extended/iputils/iputils/0001-iputils-Initialize-libgcrypt.patch
>> >  delete mode 100644
>> meta/recipes-extended/iputils/iputils/0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch
>> >  delete mode 100644
>> meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch
>> >  rename meta/recipes-extended/iputils/{iputils_s20190709.bb =>
>> iputils_s20200821.bb} (87%)
>>
>> Hi,
>>
>> Thanks for the upgrade. There seems to be an issue with tftpd:
>>
>> https://autobuilder.yoctoproject.org/typhoon/#/builders/75/builds/2389
>>
>> Error:
>>  Problem: package packagegroup-core-full-cmdline-1.0-r6.noarch requires
>> packagegroup-core-full-cmdline-extended, but none of the providers can be
>> installed
>>   - package packagegroup-core-full-cmdline-extended-1.0-r6.noarch
>> requires iputils, but none of the providers can be installed
>>   - conflicting requests
>>   - nothing provides iputils-tftpd needed by iputils-s20200821-r0.core2_32
>> (try to add '--skip-broken' to skip uninstallable packages)
>>
>> Any ideas what changed?
>>
>> Cheers,
>>
>> Richard
>>
>>
>
> --
> Thanks
> Changhyeok
> 
>

[-- Attachment #2: Type: text/html, Size: 3791 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-09-01 20:48 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-31  9:59 [OE-Core][PATCH 1/2] iw: upgrade 5.4 -> 5.8 Changhyeok Bae
2020-08-31  9:59 ` [OE-Core][PATCH 2/2] iputils: upgrade s20190709 -> s20200821 Changhyeok Bae
2020-09-01 12:32   ` Richard Purdie
2020-09-01 20:14     ` Changhyeok Bae
2020-09-01 20:48       ` Alexander Kanavin

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.