[meta-networking] mdns: remove unneeded headers

Message ID	20230619181955.103171-1-beniaminsandu@gmail.com
State	Under Review
Headers	show Return-Path: <beniaminsandu@gmail.com> ip: 209.85.218.49, mailfrom: beniaminsandu@gmail.com) From: Beniamin Sandu <beniaminsandu@gmail.com> To: openembedded-devel@lists.openembedded.org Cc: Beniamin Sandu <beniaminsandu@gmail.com> Subject: [meta-networking][PATCH] mdns: remove unneeded headers Date: Mon, 19 Jun 2023 21:19:55 +0300 Message-Id: <20230619181955.103171-1-beniaminsandu@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[meta-networking] mdns: remove unneeded headers \| expand [meta-networking] mdns: remove unneeded headers

Beniamin Sandu June 19, 2023, 6:19 p.m. UTC

Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
---
 .../mdns/0009-remove-unneeded-headers.patch   | 33 +++++++++++++++++++
 .../recipes-protocols/mdns/mdns_1790.80.10.bb |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch

Alex Kiernan June 19, 2023, 7:14 p.m. UTC | #1

Keeping up with Apple given they take nothing is frankly a right pain,
adding things which are nice to have rather than just broken seems like
we're just adding to the problem. Last time I resynchronized this it took
me days, unless there's a really good reason to do this, or there's a way
to get it upstreamed I'd rather we didn't.


On Mon, 19 Jun 2023, 19:20 Beniamin Sandu, <beniaminsandu@gmail.com> wrote:

> Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> ---
>  .../mdns/0009-remove-unneeded-headers.patch   | 33 +++++++++++++++++++
>  .../recipes-protocols/mdns/mdns_1790.80.10.bb |  1 +
>  2 files changed, 34 insertions(+)
>  create mode 100644
> meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
>
> diff --git
> a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> new file mode 100644
> index 000000000..74d387368
> --- /dev/null
> +++
> b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> @@ -0,0 +1,33 @@
> +From 1d7e71e72c597ffcc19c04373a477d1fbd3ad955 Mon Sep 17 00:00:00 2001
> +From: Beniamin Sandu <beniaminsandu@gmail.com>
> +Date: Thu, 15 Jun 2023 17:02:58 +0000
> +Subject: [PATCH] remove unneeded headers
> +
> +From a quick look, these seem to not be needed and having them
> +breaks the build with mbedtls 3.x. Without them it builds fine
> +on both 2.x and 3.x versions.
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> +---
> + mDNSPosix/mbedtls.c | 2 --
> + 1 file changed, 2 deletions(-)
> +
> +diff --git a/mDNSPosix/mbedtls.c b/mDNSPosix/mbedtls.c
> +index a73681b..ab8f8c7 100644
> +--- a/mDNSPosix/mbedtls.c
> ++++ b/mDNSPosix/mbedtls.c
> +@@ -38,10 +38,8 @@
> + #include <mbedtls/sha256.h>
> + #include <mbedtls/base64.h>
> +
> +-#include <mbedtls/certs.h>
> + #include <mbedtls/x509.h>
> + #include <mbedtls/ssl.h>
> +-#include <mbedtls/config.h>
> +
> + // Posix TLS server context
> + struct TLSContext_struct {
> +--
> +2.34.1
> diff --git a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> index 612d343c8..46f1b70cb 100644
> --- a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> +++ b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> @@ -21,6 +21,7 @@ SRC_URI = "git://
> github.com/apple-oss-distributions/mDNSResponder;protocol=https
>             file://0006-Handle-noisy-netlink-sockets.patch \
>             file://0007-Mark-deleted-interfaces-as-being-changed.patch \
>             file://0008-Handle-errors-from-socket-calls.patch \
> +           file://0009-remove-unneeded-headers.patch \
>             file://mdns.service \
>             "
>  SRCREV = "8769ab51605e465425d33d757f602ce5905ca639"
> --
> 2.25.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#103440):
> https://lists.openembedded.org/g/openembedded-devel/message/103440
> Mute This Topic: https://lists.openembedded.org/mt/99629056/3618097
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> alex.kiernan@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

Beniamin Sandu June 19, 2023, 7:38 p.m. UTC | #2

I am trying to add a v3.x mbedtls recipe to master branch, and without
this patch, mdns does not build. I could not find an obvious way to
submit upstream patches to mdns from a quick search, otherwise I would
gladly do it.

While I am with you on trying to reduce technical debt within yocto
layers, this one is very small and rather harmless, so I hope we can
make a sacrifice for the greater good. :)

Cheers,
Beni


On Mon, Jun 19, 2023 at 10:14 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
>
> Keeping up with Apple given they take nothing is frankly a right pain, adding things which are nice to have rather than just broken seems like we're just adding to the problem. Last time I resynchronized this it took me days, unless there's a really good reason to do this, or there's a way to get it upstreamed I'd rather we didn't.
>
>
> On Mon, 19 Jun 2023, 19:20 Beniamin Sandu, <beniaminsandu@gmail.com> wrote:
>>
>> Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
>> ---
>>  .../mdns/0009-remove-unneeded-headers.patch   | 33 +++++++++++++++++++
>>  .../recipes-protocols/mdns/mdns_1790.80.10.bb |  1 +
>>  2 files changed, 34 insertions(+)
>>  create mode 100644 meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
>>
>> diff --git a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
>> new file mode 100644
>> index 000000000..74d387368
>> --- /dev/null
>> +++ b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
>> @@ -0,0 +1,33 @@
>> +From 1d7e71e72c597ffcc19c04373a477d1fbd3ad955 Mon Sep 17 00:00:00 2001
>> +From: Beniamin Sandu <beniaminsandu@gmail.com>
>> +Date: Thu, 15 Jun 2023 17:02:58 +0000
>> +Subject: [PATCH] remove unneeded headers
>> +
>> +From a quick look, these seem to not be needed and having them
>> +breaks the build with mbedtls 3.x. Without them it builds fine
>> +on both 2.x and 3.x versions.
>> +
>> +Upstream-Status: Pending
>> +
>> +Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
>> +---
>> + mDNSPosix/mbedtls.c | 2 --
>> + 1 file changed, 2 deletions(-)
>> +
>> +diff --git a/mDNSPosix/mbedtls.c b/mDNSPosix/mbedtls.c
>> +index a73681b..ab8f8c7 100644
>> +--- a/mDNSPosix/mbedtls.c
>> ++++ b/mDNSPosix/mbedtls.c
>> +@@ -38,10 +38,8 @@
>> + #include <mbedtls/sha256.h>
>> + #include <mbedtls/base64.h>
>> +
>> +-#include <mbedtls/certs.h>
>> + #include <mbedtls/x509.h>
>> + #include <mbedtls/ssl.h>
>> +-#include <mbedtls/config.h>
>> +
>> + // Posix TLS server context
>> + struct TLSContext_struct {
>> +--
>> +2.34.1
>> diff --git a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
>> index 612d343c8..46f1b70cb 100644
>> --- a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
>> +++ b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
>> @@ -21,6 +21,7 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https
>>             file://0006-Handle-noisy-netlink-sockets.patch \
>>             file://0007-Mark-deleted-interfaces-as-being-changed.patch \
>>             file://0008-Handle-errors-from-socket-calls.patch \
>> +           file://0009-remove-unneeded-headers.patch \
>>             file://mdns.service \
>>             "
>>  SRCREV = "8769ab51605e465425d33d757f602ce5905ca639"
>> --
>> 2.25.1
>>
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#103440): https://lists.openembedded.org/g/openembedded-devel/message/103440
>> Mute This Topic: https://lists.openembedded.org/mt/99629056/3618097
>> Group Owner: openembedded-devel+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [alex.kiernan@gmail.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>

Khem Raj June 20, 2023, 12:51 a.m. UTC | #3

On Mon, Jun 19, 2023 at 12:14 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
>
> Keeping up with Apple given they take nothing is frankly a right pain, adding things which are nice to have rather than just broken seems like we're just adding to the problem. Last time I resynchronized this it took me days, unless there's a really good reason to do this, or there's a way to get it upstreamed I'd rather we didn't.
>

a different question would be, does upstream mdns stick to mbedTLS 2.x
or is there support for mbedTLS 3.x expected/supported.

>
> On Mon, 19 Jun 2023, 19:20 Beniamin Sandu, <beniaminsandu@gmail.com> wrote:
>>
>> Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
>> ---
>>  .../mdns/0009-remove-unneeded-headers.patch   | 33 +++++++++++++++++++
>>  .../recipes-protocols/mdns/mdns_1790.80.10.bb |  1 +
>>  2 files changed, 34 insertions(+)
>>  create mode 100644 meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
>>
>> diff --git a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
>> new file mode 100644
>> index 000000000..74d387368
>> --- /dev/null
>> +++ b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
>> @@ -0,0 +1,33 @@
>> +From 1d7e71e72c597ffcc19c04373a477d1fbd3ad955 Mon Sep 17 00:00:00 2001
>> +From: Beniamin Sandu <beniaminsandu@gmail.com>
>> +Date: Thu, 15 Jun 2023 17:02:58 +0000
>> +Subject: [PATCH] remove unneeded headers
>> +
>> +From a quick look, these seem to not be needed and having them
>> +breaks the build with mbedtls 3.x. Without them it builds fine
>> +on both 2.x and 3.x versions.
>> +
>> +Upstream-Status: Pending
>> +
>> +Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
>> +---
>> + mDNSPosix/mbedtls.c | 2 --
>> + 1 file changed, 2 deletions(-)
>> +
>> +diff --git a/mDNSPosix/mbedtls.c b/mDNSPosix/mbedtls.c
>> +index a73681b..ab8f8c7 100644
>> +--- a/mDNSPosix/mbedtls.c
>> ++++ b/mDNSPosix/mbedtls.c
>> +@@ -38,10 +38,8 @@
>> + #include <mbedtls/sha256.h>
>> + #include <mbedtls/base64.h>
>> +
>> +-#include <mbedtls/certs.h>
>> + #include <mbedtls/x509.h>
>> + #include <mbedtls/ssl.h>
>> +-#include <mbedtls/config.h>
>> +
>> + // Posix TLS server context
>> + struct TLSContext_struct {
>> +--
>> +2.34.1
>> diff --git a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
>> index 612d343c8..46f1b70cb 100644
>> --- a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
>> +++ b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
>> @@ -21,6 +21,7 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https
>>             file://0006-Handle-noisy-netlink-sockets.patch \
>>             file://0007-Mark-deleted-interfaces-as-being-changed.patch \
>>             file://0008-Handle-errors-from-socket-calls.patch \
>> +           file://0009-remove-unneeded-headers.patch \
>>             file://mdns.service \
>>             "
>>  SRCREV = "8769ab51605e465425d33d757f602ce5905ca639"
>> --
>> 2.25.1
>>
>>
>>
>>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#103444): https://lists.openembedded.org/g/openembedded-devel/message/103444
> Mute This Topic: https://lists.openembedded.org/mt/99629056/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Alex Kiernan June 20, 2023, 9:46 a.m. UTC | #4

On Tue, Jun 20, 2023 at 1:51 AM Khem Raj <raj.khem@gmail.com> wrote:
>
> On Mon, Jun 19, 2023 at 12:14 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> >
> > Keeping up with Apple given they take nothing is frankly a right pain, adding things which are nice to have rather than just broken seems like we're just adding to the problem. Last time I resynchronized this it took me days, unless there's a really good reason to do this, or there's a way to get it upstreamed I'd rather we didn't.
> >
>
> a different question would be, does upstream mdns stick to mbedTLS 2.x
> or is there support for mbedTLS 3.x expected/supported.
>

It's completely closed development, so (personally) I've no idea. The
release of code drops generally seems to follow a MacOS release, which
would suggest there's likely to be one fairly soon once 13.5 ships, so
we might have more of an idea in the next few weeks.

On mbedTLS 3, I don't obviously see that we have a recipe anywhere?

> >
> > On Mon, 19 Jun 2023, 19:20 Beniamin Sandu, <beniaminsandu@gmail.com> wrote:
> >>
> >> Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> >> ---
> >>  .../mdns/0009-remove-unneeded-headers.patch   | 33 +++++++++++++++++++
> >>  .../recipes-protocols/mdns/mdns_1790.80.10.bb |  1 +
> >>  2 files changed, 34 insertions(+)
> >>  create mode 100644 meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> >>
> >> diff --git a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> >> new file mode 100644
> >> index 000000000..74d387368
> >> --- /dev/null
> >> +++ b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> >> @@ -0,0 +1,33 @@
> >> +From 1d7e71e72c597ffcc19c04373a477d1fbd3ad955 Mon Sep 17 00:00:00 2001
> >> +From: Beniamin Sandu <beniaminsandu@gmail.com>
> >> +Date: Thu, 15 Jun 2023 17:02:58 +0000
> >> +Subject: [PATCH] remove unneeded headers
> >> +
> >> +From a quick look, these seem to not be needed and having them
> >> +breaks the build with mbedtls 3.x. Without them it builds fine
> >> +on both 2.x and 3.x versions.
> >> +
> >> +Upstream-Status: Pending
> >> +
> >> +Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> >> +---
> >> + mDNSPosix/mbedtls.c | 2 --
> >> + 1 file changed, 2 deletions(-)
> >> +
> >> +diff --git a/mDNSPosix/mbedtls.c b/mDNSPosix/mbedtls.c
> >> +index a73681b..ab8f8c7 100644
> >> +--- a/mDNSPosix/mbedtls.c
> >> ++++ b/mDNSPosix/mbedtls.c
> >> +@@ -38,10 +38,8 @@
> >> + #include <mbedtls/sha256.h>
> >> + #include <mbedtls/base64.h>
> >> +
> >> +-#include <mbedtls/certs.h>
> >> + #include <mbedtls/x509.h>
> >> + #include <mbedtls/ssl.h>
> >> +-#include <mbedtls/config.h>
> >> +
> >> + // Posix TLS server context
> >> + struct TLSContext_struct {
> >> +--
> >> +2.34.1
> >> diff --git a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> >> index 612d343c8..46f1b70cb 100644
> >> --- a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> >> +++ b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> >> @@ -21,6 +21,7 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https
> >>             file://0006-Handle-noisy-netlink-sockets.patch \
> >>             file://0007-Mark-deleted-interfaces-as-being-changed.patch \
> >>             file://0008-Handle-errors-from-socket-calls.patch \
> >> +           file://0009-remove-unneeded-headers.patch \
> >>             file://mdns.service \
> >>             "
> >>  SRCREV = "8769ab51605e465425d33d757f602ce5905ca639"
> >> --
> >> 2.25.1
> >>
> >>
> >>
> >>
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#103444): https://lists.openembedded.org/g/openembedded-devel/message/103444
> > Mute This Topic: https://lists.openembedded.org/mt/99629056/1997914
> > Group Owner: openembedded-devel+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >

Beniamin Sandu June 20, 2023, 9:55 a.m. UTC | #5

There is one on master-next, it is currently going through the CI runs
(I think): https://git.openembedded.org/meta-openembedded/commit/?h=master-next&id=9cb5f5c6e91612674eb02f79437abbd51ad7b38f.
I have tested this one on my side with a couple of different machines
on both poky with glibc and yoe with musl, seems fine so far. Mbedtls
v2 will still be available, so the end user can build with that if
preferred.

On a different note, seems the oe patches got added to a PR on github
for mdns: https://github.com/apple-oss-distributions/mDNSResponder/pull/2,
and someone accepted this last week. Not sure if it's going to do
anything, but maybe there is some hope of having them in a future
release, even if it's very opaque by nature.

On Tue, Jun 20, 2023 at 12:46 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
>
> On Tue, Jun 20, 2023 at 1:51 AM Khem Raj <raj.khem@gmail.com> wrote:
> >
> > On Mon, Jun 19, 2023 at 12:14 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> > >
> > > Keeping up with Apple given they take nothing is frankly a right pain, adding things which are nice to have rather than just broken seems like we're just adding to the problem. Last time I resynchronized this it took me days, unless there's a really good reason to do this, or there's a way to get it upstreamed I'd rather we didn't.
> > >
> >
> > a different question would be, does upstream mdns stick to mbedTLS 2.x
> > or is there support for mbedTLS 3.x expected/supported.
> >
>
> It's completely closed development, so (personally) I've no idea. The
> release of code drops generally seems to follow a MacOS release, which
> would suggest there's likely to be one fairly soon once 13.5 ships, so
> we might have more of an idea in the next few weeks.
>
> On mbedTLS 3, I don't obviously see that we have a recipe anywhere?
>
> > >
> > > On Mon, 19 Jun 2023, 19:20 Beniamin Sandu, <beniaminsandu@gmail.com> wrote:
> > >>
> > >> Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> > >> ---
> > >>  .../mdns/0009-remove-unneeded-headers.patch   | 33 +++++++++++++++++++
> > >>  .../recipes-protocols/mdns/mdns_1790.80.10.bb |  1 +
> > >>  2 files changed, 34 insertions(+)
> > >>  create mode 100644 meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > >>
> > >> diff --git a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > >> new file mode 100644
> > >> index 000000000..74d387368
> > >> --- /dev/null
> > >> +++ b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > >> @@ -0,0 +1,33 @@
> > >> +From 1d7e71e72c597ffcc19c04373a477d1fbd3ad955 Mon Sep 17 00:00:00 2001
> > >> +From: Beniamin Sandu <beniaminsandu@gmail.com>
> > >> +Date: Thu, 15 Jun 2023 17:02:58 +0000
> > >> +Subject: [PATCH] remove unneeded headers
> > >> +
> > >> +From a quick look, these seem to not be needed and having them
> > >> +breaks the build with mbedtls 3.x. Without them it builds fine
> > >> +on both 2.x and 3.x versions.
> > >> +
> > >> +Upstream-Status: Pending
> > >> +
> > >> +Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> > >> +---
> > >> + mDNSPosix/mbedtls.c | 2 --
> > >> + 1 file changed, 2 deletions(-)
> > >> +
> > >> +diff --git a/mDNSPosix/mbedtls.c b/mDNSPosix/mbedtls.c
> > >> +index a73681b..ab8f8c7 100644
> > >> +--- a/mDNSPosix/mbedtls.c
> > >> ++++ b/mDNSPosix/mbedtls.c
> > >> +@@ -38,10 +38,8 @@
> > >> + #include <mbedtls/sha256.h>
> > >> + #include <mbedtls/base64.h>
> > >> +
> > >> +-#include <mbedtls/certs.h>
> > >> + #include <mbedtls/x509.h>
> > >> + #include <mbedtls/ssl.h>
> > >> +-#include <mbedtls/config.h>
> > >> +
> > >> + // Posix TLS server context
> > >> + struct TLSContext_struct {
> > >> +--
> > >> +2.34.1
> > >> diff --git a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > >> index 612d343c8..46f1b70cb 100644
> > >> --- a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > >> +++ b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > >> @@ -21,6 +21,7 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https
> > >>             file://0006-Handle-noisy-netlink-sockets.patch \
> > >>             file://0007-Mark-deleted-interfaces-as-being-changed.patch \
> > >>             file://0008-Handle-errors-from-socket-calls.patch \
> > >> +           file://0009-remove-unneeded-headers.patch \
> > >>             file://mdns.service \
> > >>             "
> > >>  SRCREV = "8769ab51605e465425d33d757f602ce5905ca639"
> > >> --
> > >> 2.25.1
> > >>
> > >>
> > >>
> > >>
> > >
> > > -=-=-=-=-=-=-=-=-=-=-=-
> > > Links: You receive all messages sent to this group.
> > > View/Reply Online (#103444): https://lists.openembedded.org/g/openembedded-devel/message/103444
> > > Mute This Topic: https://lists.openembedded.org/mt/99629056/1997914
> > > Group Owner: openembedded-devel+owner@lists.openembedded.org
> > > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> > > -=-=-=-=-=-=-=-=-=-=-=-
> > >
>
>
>
> --
> Alex Kiernan

Alex Kiernan June 20, 2023, 9:55 a.m. UTC | #6

On Mon, Jun 19, 2023 at 8:38 PM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
>
> I am trying to add a v3.x mbedtls recipe to master branch, and without

Sorry, was reading the thread out of order and missed that you were
trying to add an Mbed TLS 3 recipe!

> this patch, mdns does not build. I could not find an obvious way to
> submit upstream patches to mdns from a quick search, otherwise I would
> gladly do it.
>

Several folk have tried sending them to dts@apple.com (seemingly
without success), there's also a couple of attempted PRs on github
(again seemingly going nowhere). Winding back about 20 years, I tried
to get a bunch of portability fixes into the Quicktime Streaming
Server without success - the model appears to very much be open
source, not open contribution.

> While I am with you on trying to reduce technical debt within yocto
> layers, this one is very small and rather harmless, so I hope we can
> make a sacrifice for the greater good. :)
>

I'm guessing we'll need to scope an Mbed TLS 3 recipe as being
explicitly mbedtls3_...? So sticking with 2.x doesn't feel like a
terrible option, but I agree its not ideal.

My concern isn't really with the one liner now, its the how hard does
it become to do the upgrades down the road - if we suddenly can't
upgrade because upstream's stuck on 2.x and there's something
incompatible with 3.x what do we do?

> Cheers,
> Beni
>
>
> On Mon, Jun 19, 2023 at 10:14 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> >
> > Keeping up with Apple given they take nothing is frankly a right pain, adding things which are nice to have rather than just broken seems like we're just adding to the problem. Last time I resynchronized this it took me days, unless there's a really good reason to do this, or there's a way to get it upstreamed I'd rather we didn't.
> >
> >
> > On Mon, 19 Jun 2023, 19:20 Beniamin Sandu, <beniaminsandu@gmail.com> wrote:
> >>
> >> Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> >> ---
> >>  .../mdns/0009-remove-unneeded-headers.patch   | 33 +++++++++++++++++++
> >>  .../recipes-protocols/mdns/mdns_1790.80.10.bb |  1 +
> >>  2 files changed, 34 insertions(+)
> >>  create mode 100644 meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> >>
> >> diff --git a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> >> new file mode 100644
> >> index 000000000..74d387368
> >> --- /dev/null
> >> +++ b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> >> @@ -0,0 +1,33 @@
> >> +From 1d7e71e72c597ffcc19c04373a477d1fbd3ad955 Mon Sep 17 00:00:00 2001
> >> +From: Beniamin Sandu <beniaminsandu@gmail.com>
> >> +Date: Thu, 15 Jun 2023 17:02:58 +0000
> >> +Subject: [PATCH] remove unneeded headers
> >> +
> >> +From a quick look, these seem to not be needed and having them
> >> +breaks the build with mbedtls 3.x. Without them it builds fine
> >> +on both 2.x and 3.x versions.
> >> +
> >> +Upstream-Status: Pending
> >> +
> >> +Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> >> +---
> >> + mDNSPosix/mbedtls.c | 2 --
> >> + 1 file changed, 2 deletions(-)
> >> +
> >> +diff --git a/mDNSPosix/mbedtls.c b/mDNSPosix/mbedtls.c
> >> +index a73681b..ab8f8c7 100644
> >> +--- a/mDNSPosix/mbedtls.c
> >> ++++ b/mDNSPosix/mbedtls.c
> >> +@@ -38,10 +38,8 @@
> >> + #include <mbedtls/sha256.h>
> >> + #include <mbedtls/base64.h>
> >> +
> >> +-#include <mbedtls/certs.h>
> >> + #include <mbedtls/x509.h>
> >> + #include <mbedtls/ssl.h>
> >> +-#include <mbedtls/config.h>
> >> +
> >> + // Posix TLS server context
> >> + struct TLSContext_struct {
> >> +--
> >> +2.34.1
> >> diff --git a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> >> index 612d343c8..46f1b70cb 100644
> >> --- a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> >> +++ b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> >> @@ -21,6 +21,7 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https
> >>             file://0006-Handle-noisy-netlink-sockets.patch \
> >>             file://0007-Mark-deleted-interfaces-as-being-changed.patch \
> >>             file://0008-Handle-errors-from-socket-calls.patch \
> >> +           file://0009-remove-unneeded-headers.patch \
> >>             file://mdns.service \
> >>             "
> >>  SRCREV = "8769ab51605e465425d33d757f602ce5905ca639"
> >> --
> >> 2.25.1
> >>
> >>
> >> -=-=-=-=-=-=-=-=-=-=-=-
> >> Links: You receive all messages sent to this group.
> >> View/Reply Online (#103440): https://lists.openembedded.org/g/openembedded-devel/message/103440
> >> Mute This Topic: https://lists.openembedded.org/mt/99629056/3618097
> >> Group Owner: openembedded-devel+owner@lists.openembedded.org
> >> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [alex.kiernan@gmail.com]
> >> -=-=-=-=-=-=-=-=-=-=-=-
> >>

Alex Kiernan June 20, 2023, 9:57 a.m. UTC | #7

On Tue, Jun 20, 2023 at 10:55 AM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
>
> There is one on master-next, it is currently going through the CI runs
> (I think): https://git.openembedded.org/meta-openembedded/commit/?h=master-next&id=9cb5f5c6e91612674eb02f79437abbd51ad7b38f.
> I have tested this one on my side with a couple of different machines
> on both poky with glibc and yoe with musl, seems fine so far. Mbedtls
> v2 will still be available, so the end user can build with that if
> preferred.
>
> On a different note, seems the oe patches got added to a PR on github
> for mdns: https://github.com/apple-oss-distributions/mDNSResponder/pull/2,
> and someone accepted this last week. Not sure if it's going to do
> anything, but maybe there is some hope of having them in a future
> release, even if it's very opaque by nature.
>

I suspect that's just a lack of process embedded in the repo, so
anyone can review/approve...

> On Tue, Jun 20, 2023 at 12:46 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> >
> > On Tue, Jun 20, 2023 at 1:51 AM Khem Raj <raj.khem@gmail.com> wrote:
> > >
> > > On Mon, Jun 19, 2023 at 12:14 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> > > >
> > > > Keeping up with Apple given they take nothing is frankly a right pain, adding things which are nice to have rather than just broken seems like we're just adding to the problem. Last time I resynchronized this it took me days, unless there's a really good reason to do this, or there's a way to get it upstreamed I'd rather we didn't.
> > > >
> > >
> > > a different question would be, does upstream mdns stick to mbedTLS 2.x
> > > or is there support for mbedTLS 3.x expected/supported.
> > >
> >
> > It's completely closed development, so (personally) I've no idea. The
> > release of code drops generally seems to follow a MacOS release, which
> > would suggest there's likely to be one fairly soon once 13.5 ships, so
> > we might have more of an idea in the next few weeks.
> >
> > On mbedTLS 3, I don't obviously see that we have a recipe anywhere?
> >
> > > >
> > > > On Mon, 19 Jun 2023, 19:20 Beniamin Sandu, <beniaminsandu@gmail.com> wrote:
> > > >>
> > > >> Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> > > >> ---
> > > >>  .../mdns/0009-remove-unneeded-headers.patch   | 33 +++++++++++++++++++
> > > >>  .../recipes-protocols/mdns/mdns_1790.80.10.bb |  1 +
> > > >>  2 files changed, 34 insertions(+)
> > > >>  create mode 100644 meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > >>
> > > >> diff --git a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > >> new file mode 100644
> > > >> index 000000000..74d387368
> > > >> --- /dev/null
> > > >> +++ b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > >> @@ -0,0 +1,33 @@
> > > >> +From 1d7e71e72c597ffcc19c04373a477d1fbd3ad955 Mon Sep 17 00:00:00 2001
> > > >> +From: Beniamin Sandu <beniaminsandu@gmail.com>
> > > >> +Date: Thu, 15 Jun 2023 17:02:58 +0000
> > > >> +Subject: [PATCH] remove unneeded headers
> > > >> +
> > > >> +From a quick look, these seem to not be needed and having them
> > > >> +breaks the build with mbedtls 3.x. Without them it builds fine
> > > >> +on both 2.x and 3.x versions.
> > > >> +
> > > >> +Upstream-Status: Pending
> > > >> +
> > > >> +Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> > > >> +---
> > > >> + mDNSPosix/mbedtls.c | 2 --
> > > >> + 1 file changed, 2 deletions(-)
> > > >> +
> > > >> +diff --git a/mDNSPosix/mbedtls.c b/mDNSPosix/mbedtls.c
> > > >> +index a73681b..ab8f8c7 100644
> > > >> +--- a/mDNSPosix/mbedtls.c
> > > >> ++++ b/mDNSPosix/mbedtls.c
> > > >> +@@ -38,10 +38,8 @@
> > > >> + #include <mbedtls/sha256.h>
> > > >> + #include <mbedtls/base64.h>
> > > >> +
> > > >> +-#include <mbedtls/certs.h>
> > > >> + #include <mbedtls/x509.h>
> > > >> + #include <mbedtls/ssl.h>
> > > >> +-#include <mbedtls/config.h>
> > > >> +
> > > >> + // Posix TLS server context
> > > >> + struct TLSContext_struct {
> > > >> +--
> > > >> +2.34.1
> > > >> diff --git a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > >> index 612d343c8..46f1b70cb 100644
> > > >> --- a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > >> +++ b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > >> @@ -21,6 +21,7 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https
> > > >>             file://0006-Handle-noisy-netlink-sockets.patch \
> > > >>             file://0007-Mark-deleted-interfaces-as-being-changed.patch \
> > > >>             file://0008-Handle-errors-from-socket-calls.patch \
> > > >> +           file://0009-remove-unneeded-headers.patch \
> > > >>             file://mdns.service \
> > > >>             "
> > > >>  SRCREV = "8769ab51605e465425d33d757f602ce5905ca639"
> > > >> --
> > > >> 2.25.1
> > > >>
> > > >>
> > > >>
> > > >>
> > > >
> > > > -=-=-=-=-=-=-=-=-=-=-=-
> > > > Links: You receive all messages sent to this group.
> > > > View/Reply Online (#103444): https://lists.openembedded.org/g/openembedded-devel/message/103444
> > > > Mute This Topic: https://lists.openembedded.org/mt/99629056/1997914
> > > > Group Owner: openembedded-devel+owner@lists.openembedded.org
> > > > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> > > > -=-=-=-=-=-=-=-=-=-=-=-
> > > >
> >
> >
> >
> > --
> > Alex Kiernan

Beniamin Sandu June 20, 2023, 10:17 a.m. UTC | #8

On Tue, Jun 20, 2023 at 12:58 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
>
> On Tue, Jun 20, 2023 at 10:55 AM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
> >
> > There is one on master-next, it is currently going through the CI runs
> > (I think): https://git.openembedded.org/meta-openembedded/commit/?h=master-next&id=9cb5f5c6e91612674eb02f79437abbd51ad7b38f.
> > I have tested this one on my side with a couple of different machines
> > on both poky with glibc and yoe with musl, seems fine so far. Mbedtls
> > v2 will still be available, so the end user can build with that if
> > preferred.
> >
> > On a different note, seems the oe patches got added to a PR on github
> > for mdns: https://github.com/apple-oss-distributions/mDNSResponder/pull/2,
> > and someone accepted this last week. Not sure if it's going to do
> > anything, but maybe there is some hope of having them in a future
> > release, even if it's very opaque by nature.
> >
>
> I suspect that's just a lack of process embedded in the repo, so
> anyone can review/approve...
>
I tend to agree, seems there is no real process on GH at the moment.

I think we are fine right now, both versions are still available and
one can choose between them when building, if the version turns out to
be a requirement.
Some issues might arise with other packages in the future if we drop
v2 completely, but I guess we deal with them as they come, as it's
hard to predict every impact that this could have.

> > On Tue, Jun 20, 2023 at 12:46 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> > >
> > > On Tue, Jun 20, 2023 at 1:51 AM Khem Raj <raj.khem@gmail.com> wrote:
> > > >
> > > > On Mon, Jun 19, 2023 at 12:14 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> > > > >
> > > > > Keeping up with Apple given they take nothing is frankly a right pain, adding things which are nice to have rather than just broken seems like we're just adding to the problem. Last time I resynchronized this it took me days, unless there's a really good reason to do this, or there's a way to get it upstreamed I'd rather we didn't.
> > > > >
> > > >
> > > > a different question would be, does upstream mdns stick to mbedTLS 2.x
> > > > or is there support for mbedTLS 3.x expected/supported.
> > > >
> > >
> > > It's completely closed development, so (personally) I've no idea. The
> > > release of code drops generally seems to follow a MacOS release, which
> > > would suggest there's likely to be one fairly soon once 13.5 ships, so
> > > we might have more of an idea in the next few weeks.
> > >
> > > On mbedTLS 3, I don't obviously see that we have a recipe anywhere?
> > >
> > > > >
> > > > > On Mon, 19 Jun 2023, 19:20 Beniamin Sandu, <beniaminsandu@gmail.com> wrote:
> > > > >>
> > > > >> Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> > > > >> ---
> > > > >>  .../mdns/0009-remove-unneeded-headers.patch   | 33 +++++++++++++++++++
> > > > >>  .../recipes-protocols/mdns/mdns_1790.80.10.bb |  1 +
> > > > >>  2 files changed, 34 insertions(+)
> > > > >>  create mode 100644 meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > > >>
> > > > >> diff --git a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > > >> new file mode 100644
> > > > >> index 000000000..74d387368
> > > > >> --- /dev/null
> > > > >> +++ b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > > >> @@ -0,0 +1,33 @@
> > > > >> +From 1d7e71e72c597ffcc19c04373a477d1fbd3ad955 Mon Sep 17 00:00:00 2001
> > > > >> +From: Beniamin Sandu <beniaminsandu@gmail.com>
> > > > >> +Date: Thu, 15 Jun 2023 17:02:58 +0000
> > > > >> +Subject: [PATCH] remove unneeded headers
> > > > >> +
> > > > >> +From a quick look, these seem to not be needed and having them
> > > > >> +breaks the build with mbedtls 3.x. Without them it builds fine
> > > > >> +on both 2.x and 3.x versions.
> > > > >> +
> > > > >> +Upstream-Status: Pending
> > > > >> +
> > > > >> +Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> > > > >> +---
> > > > >> + mDNSPosix/mbedtls.c | 2 --
> > > > >> + 1 file changed, 2 deletions(-)
> > > > >> +
> > > > >> +diff --git a/mDNSPosix/mbedtls.c b/mDNSPosix/mbedtls.c
> > > > >> +index a73681b..ab8f8c7 100644
> > > > >> +--- a/mDNSPosix/mbedtls.c
> > > > >> ++++ b/mDNSPosix/mbedtls.c
> > > > >> +@@ -38,10 +38,8 @@
> > > > >> + #include <mbedtls/sha256.h>
> > > > >> + #include <mbedtls/base64.h>
> > > > >> +
> > > > >> +-#include <mbedtls/certs.h>
> > > > >> + #include <mbedtls/x509.h>
> > > > >> + #include <mbedtls/ssl.h>
> > > > >> +-#include <mbedtls/config.h>
> > > > >> +
> > > > >> + // Posix TLS server context
> > > > >> + struct TLSContext_struct {
> > > > >> +--
> > > > >> +2.34.1
> > > > >> diff --git a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > > >> index 612d343c8..46f1b70cb 100644
> > > > >> --- a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > > >> +++ b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > > >> @@ -21,6 +21,7 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https
> > > > >>             file://0006-Handle-noisy-netlink-sockets.patch \
> > > > >>             file://0007-Mark-deleted-interfaces-as-being-changed.patch \
> > > > >>             file://0008-Handle-errors-from-socket-calls.patch \
> > > > >> +           file://0009-remove-unneeded-headers.patch \
> > > > >>             file://mdns.service \
> > > > >>             "
> > > > >>  SRCREV = "8769ab51605e465425d33d757f602ce5905ca639"
> > > > >> --
> > > > >> 2.25.1
> > > > >>
> > > > >>
> > > > >>
> > > > >>
> > > > >
> > > > > -=-=-=-=-=-=-=-=-=-=-=-
> > > > > Links: You receive all messages sent to this group.
> > > > > View/Reply Online (#103444): https://lists.openembedded.org/g/openembedded-devel/message/103444
> > > > > Mute This Topic: https://lists.openembedded.org/mt/99629056/1997914
> > > > > Group Owner: openembedded-devel+owner@lists.openembedded.org
> > > > > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> > > > > -=-=-=-=-=-=-=-=-=-=-=-
> > > > >
> > >
> > >
> > >
> > > --
> > > Alex Kiernan
>
>
>
> --
> Alex Kiernan

Beniamin Sandu June 20, 2023, 10:53 a.m. UTC | #9

On Tue, Jun 20, 2023 at 12:56 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
>
> On Mon, Jun 19, 2023 at 8:38 PM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
> >
> > I am trying to add a v3.x mbedtls recipe to master branch, and without
>
> Sorry, was reading the thread out of order and missed that you were
> trying to add an Mbed TLS 3 recipe!
>
> > this patch, mdns does not build. I could not find an obvious way to
> > submit upstream patches to mdns from a quick search, otherwise I would
> > gladly do it.
> >
>
> Several folk have tried sending them to dts@apple.com (seemingly
> without success), there's also a couple of attempted PRs on github
> (again seemingly going nowhere). Winding back about 20 years, I tried
> to get a bunch of portability fixes into the Quicktime Streaming
> Server without success - the model appears to very much be open
> source, not open contribution.
>
> > While I am with you on trying to reduce technical debt within yocto
> > layers, this one is very small and rather harmless, so I hope we can
> > make a sacrifice for the greater good. :)
> >
>
> I'm guessing we'll need to scope an Mbed TLS 3 recipe as being
> explicitly mbedtls3_...? So sticking with 2.x doesn't feel like a
> terrible option, but I agree its not ideal.

This also sounds like a fairly decent option, having a separate
mbedtls3 package might make it easier in general, although I am not
aware of how used the current v2 version actually is.

>
> My concern isn't really with the one liner now, its the how hard does
> it become to do the upgrades down the road - if we suddenly can't
> upgrade because upstream's stuck on 2.x and there's something
> incompatible with 3.x what do we do?
>
> > Cheers,
> > Beni
> >
> >
> > On Mon, Jun 19, 2023 at 10:14 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> > >
> > > Keeping up with Apple given they take nothing is frankly a right pain, adding things which are nice to have rather than just broken seems like we're just adding to the problem. Last time I resynchronized this it took me days, unless there's a really good reason to do this, or there's a way to get it upstreamed I'd rather we didn't.
> > >
> > >
> > > On Mon, 19 Jun 2023, 19:20 Beniamin Sandu, <beniaminsandu@gmail.com> wrote:
> > >>
> > >> Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> > >> ---
> > >>  .../mdns/0009-remove-unneeded-headers.patch   | 33 +++++++++++++++++++
> > >>  .../recipes-protocols/mdns/mdns_1790.80.10.bb |  1 +
> > >>  2 files changed, 34 insertions(+)
> > >>  create mode 100644 meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > >>
> > >> diff --git a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > >> new file mode 100644
> > >> index 000000000..74d387368
> > >> --- /dev/null
> > >> +++ b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > >> @@ -0,0 +1,33 @@
> > >> +From 1d7e71e72c597ffcc19c04373a477d1fbd3ad955 Mon Sep 17 00:00:00 2001
> > >> +From: Beniamin Sandu <beniaminsandu@gmail.com>
> > >> +Date: Thu, 15 Jun 2023 17:02:58 +0000
> > >> +Subject: [PATCH] remove unneeded headers
> > >> +
> > >> +From a quick look, these seem to not be needed and having them
> > >> +breaks the build with mbedtls 3.x. Without them it builds fine
> > >> +on both 2.x and 3.x versions.
> > >> +
> > >> +Upstream-Status: Pending
> > >> +
> > >> +Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> > >> +---
> > >> + mDNSPosix/mbedtls.c | 2 --
> > >> + 1 file changed, 2 deletions(-)
> > >> +
> > >> +diff --git a/mDNSPosix/mbedtls.c b/mDNSPosix/mbedtls.c
> > >> +index a73681b..ab8f8c7 100644
> > >> +--- a/mDNSPosix/mbedtls.c
> > >> ++++ b/mDNSPosix/mbedtls.c
> > >> +@@ -38,10 +38,8 @@
> > >> + #include <mbedtls/sha256.h>
> > >> + #include <mbedtls/base64.h>
> > >> +
> > >> +-#include <mbedtls/certs.h>
> > >> + #include <mbedtls/x509.h>
> > >> + #include <mbedtls/ssl.h>
> > >> +-#include <mbedtls/config.h>
> > >> +
> > >> + // Posix TLS server context
> > >> + struct TLSContext_struct {
> > >> +--
> > >> +2.34.1
> > >> diff --git a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > >> index 612d343c8..46f1b70cb 100644
> > >> --- a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > >> +++ b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > >> @@ -21,6 +21,7 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https
> > >>             file://0006-Handle-noisy-netlink-sockets.patch \
> > >>             file://0007-Mark-deleted-interfaces-as-being-changed.patch \
> > >>             file://0008-Handle-errors-from-socket-calls.patch \
> > >> +           file://0009-remove-unneeded-headers.patch \
> > >>             file://mdns.service \
> > >>             "
> > >>  SRCREV = "8769ab51605e465425d33d757f602ce5905ca639"
> > >> --
> > >> 2.25.1
> > >>
> > >>
> > >> -=-=-=-=-=-=-=-=-=-=-=-
> > >> Links: You receive all messages sent to this group.
> > >> View/Reply Online (#103440): https://lists.openembedded.org/g/openembedded-devel/message/103440
> > >> Mute This Topic: https://lists.openembedded.org/mt/99629056/3618097
> > >> Group Owner: openembedded-devel+owner@lists.openembedded.org
> > >> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [alex.kiernan@gmail.com]
> > >> -=-=-=-=-=-=-=-=-=-=-=-
> > >>
>
>
>
> --
> Alex Kiernan

Alex Kiernan June 20, 2023, 12:02 p.m. UTC | #10

On Tue, Jun 20, 2023 at 11:53 AM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
>
> On Tue, Jun 20, 2023 at 12:56 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> >
> > On Mon, Jun 19, 2023 at 8:38 PM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
> > >
> > > I am trying to add a v3.x mbedtls recipe to master branch, and without
> >
> > Sorry, was reading the thread out of order and missed that you were
> > trying to add an Mbed TLS 3 recipe!
> >
> > > this patch, mdns does not build. I could not find an obvious way to
> > > submit upstream patches to mdns from a quick search, otherwise I would
> > > gladly do it.
> > >
> >
> > Several folk have tried sending them to dts@apple.com (seemingly
> > without success), there's also a couple of attempted PRs on github
> > (again seemingly going nowhere). Winding back about 20 years, I tried
> > to get a bunch of portability fixes into the Quicktime Streaming
> > Server without success - the model appears to very much be open
> > source, not open contribution.
> >
> > > While I am with you on trying to reduce technical debt within yocto
> > > layers, this one is very small and rather harmless, so I hope we can
> > > make a sacrifice for the greater good. :)
> > >
> >
> > I'm guessing we'll need to scope an Mbed TLS 3 recipe as being
> > explicitly mbedtls3_...? So sticking with 2.x doesn't feel like a
> > terrible option, but I agree its not ideal.
>
> This also sounds like a fairly decent option, having a separate
> mbedtls3 package might make it easier in general, although I am not
> aware of how used the current v2 version actually is.
>

Looks like we're out of date (there's a 2.28.3), but it's still
supported for now... "Mbed TLS 2.28 is a long-time support branch. It
will be supported with bug-fixes and security fixes until end of
2024."

> >
> > My concern isn't really with the one liner now, its the how hard does
> > it become to do the upgrades down the road - if we suddenly can't
> > upgrade because upstream's stuck on 2.x and there's something
> > incompatible with 3.x what do we do?
> >
> > > Cheers,
> > > Beni
> > >
> > >
> > > On Mon, Jun 19, 2023 at 10:14 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> > > >
> > > > Keeping up with Apple given they take nothing is frankly a right pain, adding things which are nice to have rather than just broken seems like we're just adding to the problem. Last time I resynchronized this it took me days, unless there's a really good reason to do this, or there's a way to get it upstreamed I'd rather we didn't.
> > > >
> > > >
> > > > On Mon, 19 Jun 2023, 19:20 Beniamin Sandu, <beniaminsandu@gmail.com> wrote:
> > > >>
> > > >> Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> > > >> ---
> > > >>  .../mdns/0009-remove-unneeded-headers.patch   | 33 +++++++++++++++++++
> > > >>  .../recipes-protocols/mdns/mdns_1790.80.10.bb |  1 +
> > > >>  2 files changed, 34 insertions(+)
> > > >>  create mode 100644 meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > >>
> > > >> diff --git a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > >> new file mode 100644
> > > >> index 000000000..74d387368
> > > >> --- /dev/null
> > > >> +++ b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > >> @@ -0,0 +1,33 @@
> > > >> +From 1d7e71e72c597ffcc19c04373a477d1fbd3ad955 Mon Sep 17 00:00:00 2001
> > > >> +From: Beniamin Sandu <beniaminsandu@gmail.com>
> > > >> +Date: Thu, 15 Jun 2023 17:02:58 +0000
> > > >> +Subject: [PATCH] remove unneeded headers
> > > >> +
> > > >> +From a quick look, these seem to not be needed and having them
> > > >> +breaks the build with mbedtls 3.x. Without them it builds fine
> > > >> +on both 2.x and 3.x versions.
> > > >> +
> > > >> +Upstream-Status: Pending
> > > >> +
> > > >> +Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> > > >> +---
> > > >> + mDNSPosix/mbedtls.c | 2 --
> > > >> + 1 file changed, 2 deletions(-)
> > > >> +
> > > >> +diff --git a/mDNSPosix/mbedtls.c b/mDNSPosix/mbedtls.c
> > > >> +index a73681b..ab8f8c7 100644
> > > >> +--- a/mDNSPosix/mbedtls.c
> > > >> ++++ b/mDNSPosix/mbedtls.c
> > > >> +@@ -38,10 +38,8 @@
> > > >> + #include <mbedtls/sha256.h>
> > > >> + #include <mbedtls/base64.h>
> > > >> +
> > > >> +-#include <mbedtls/certs.h>
> > > >> + #include <mbedtls/x509.h>
> > > >> + #include <mbedtls/ssl.h>
> > > >> +-#include <mbedtls/config.h>
> > > >> +
> > > >> + // Posix TLS server context
> > > >> + struct TLSContext_struct {
> > > >> +--
> > > >> +2.34.1
> > > >> diff --git a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > >> index 612d343c8..46f1b70cb 100644
> > > >> --- a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > >> +++ b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > >> @@ -21,6 +21,7 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https
> > > >>             file://0006-Handle-noisy-netlink-sockets.patch \
> > > >>             file://0007-Mark-deleted-interfaces-as-being-changed.patch \
> > > >>             file://0008-Handle-errors-from-socket-calls.patch \
> > > >> +           file://0009-remove-unneeded-headers.patch \
> > > >>             file://mdns.service \
> > > >>             "
> > > >>  SRCREV = "8769ab51605e465425d33d757f602ce5905ca639"
> > > >> --
> > > >> 2.25.1
> > > >>
> > > >>
> > > >> -=-=-=-=-=-=-=-=-=-=-=-
> > > >> Links: You receive all messages sent to this group.
> > > >> View/Reply Online (#103440): https://lists.openembedded.org/g/openembedded-devel/message/103440
> > > >> Mute This Topic: https://lists.openembedded.org/mt/99629056/3618097
> > > >> Group Owner: openembedded-devel+owner@lists.openembedded.org
> > > >> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [alex.kiernan@gmail.com]
> > > >> -=-=-=-=-=-=-=-=-=-=-=-
> > > >>
> >
> >
> >
> > --
> > Alex Kiernan

Alex Kiernan June 20, 2023, 12:42 p.m. UTC | #11

On Tue, Jun 20, 2023 at 1:03 PM Alex Kiernan via
lists.openembedded.org <alex.kiernan=gmail.com@lists.openembedded.org>
wrote:
>
> On Tue, Jun 20, 2023 at 11:53 AM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
> >
> > On Tue, Jun 20, 2023 at 12:56 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> > >
> > > On Mon, Jun 19, 2023 at 8:38 PM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
> > > >
> > > > I am trying to add a v3.x mbedtls recipe to master branch, and without
> > >
> > > Sorry, was reading the thread out of order and missed that you were
> > > trying to add an Mbed TLS 3 recipe!
> > >
> > > > this patch, mdns does not build. I could not find an obvious way to
> > > > submit upstream patches to mdns from a quick search, otherwise I would
> > > > gladly do it.
> > > >
> > >
> > > Several folk have tried sending them to dts@apple.com (seemingly
> > > without success), there's also a couple of attempted PRs on github
> > > (again seemingly going nowhere). Winding back about 20 years, I tried
> > > to get a bunch of portability fixes into the Quicktime Streaming
> > > Server without success - the model appears to very much be open
> > > source, not open contribution.
> > >
> > > > While I am with you on trying to reduce technical debt within yocto
> > > > layers, this one is very small and rather harmless, so I hope we can
> > > > make a sacrifice for the greater good. :)
> > > >
> > >
> > > I'm guessing we'll need to scope an Mbed TLS 3 recipe as being
> > > explicitly mbedtls3_...? So sticking with 2.x doesn't feel like a
> > > terrible option, but I agree its not ideal.
> >
> > This also sounds like a fairly decent option, having a separate
> > mbedtls3 package might make it easier in general, although I am not
> > aware of how used the current v2 version actually is.
> >
>
> Looks like we're out of date (there's a 2.28.3), but it's still
> supported for now... "Mbed TLS 2.28 is a long-time support branch. It
> will be supported with bug-fixes and security fixes until end of
> 2024."
>

Will send an update for 2.28.3, but constrain `devtool upgrade` to
things on the 2.x branch

One thought on 3.x - if mdns is the only failure maybe rename the
current recipe to mbedtls2_% and add 3.x as mbedtls_% and then fix up
the mdns recipe to consume mbedtls2?

> > >
> > > My concern isn't really with the one liner now, its the how hard does
> > > it become to do the upgrades down the road - if we suddenly can't
> > > upgrade because upstream's stuck on 2.x and there's something
> > > incompatible with 3.x what do we do?
> > >
> > > > Cheers,
> > > > Beni
> > > >
> > > >
> > > > On Mon, Jun 19, 2023 at 10:14 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> > > > >
> > > > > Keeping up with Apple given they take nothing is frankly a right pain, adding things which are nice to have rather than just broken seems like we're just adding to the problem. Last time I resynchronized this it took me days, unless there's a really good reason to do this, or there's a way to get it upstreamed I'd rather we didn't.
> > > > >
> > > > >
> > > > > On Mon, 19 Jun 2023, 19:20 Beniamin Sandu, <beniaminsandu@gmail.com> wrote:
> > > > >>
> > > > >> Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> > > > >> ---
> > > > >>  .../mdns/0009-remove-unneeded-headers.patch   | 33 +++++++++++++++++++
> > > > >>  .../recipes-protocols/mdns/mdns_1790.80.10.bb |  1 +
> > > > >>  2 files changed, 34 insertions(+)
> > > > >>  create mode 100644 meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > > >>
> > > > >> diff --git a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > > >> new file mode 100644
> > > > >> index 000000000..74d387368
> > > > >> --- /dev/null
> > > > >> +++ b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > > >> @@ -0,0 +1,33 @@
> > > > >> +From 1d7e71e72c597ffcc19c04373a477d1fbd3ad955 Mon Sep 17 00:00:00 2001
> > > > >> +From: Beniamin Sandu <beniaminsandu@gmail.com>
> > > > >> +Date: Thu, 15 Jun 2023 17:02:58 +0000
> > > > >> +Subject: [PATCH] remove unneeded headers
> > > > >> +
> > > > >> +From a quick look, these seem to not be needed and having them
> > > > >> +breaks the build with mbedtls 3.x. Without them it builds fine
> > > > >> +on both 2.x and 3.x versions.
> > > > >> +
> > > > >> +Upstream-Status: Pending
> > > > >> +
> > > > >> +Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> > > > >> +---
> > > > >> + mDNSPosix/mbedtls.c | 2 --
> > > > >> + 1 file changed, 2 deletions(-)
> > > > >> +
> > > > >> +diff --git a/mDNSPosix/mbedtls.c b/mDNSPosix/mbedtls.c
> > > > >> +index a73681b..ab8f8c7 100644
> > > > >> +--- a/mDNSPosix/mbedtls.c
> > > > >> ++++ b/mDNSPosix/mbedtls.c
> > > > >> +@@ -38,10 +38,8 @@
> > > > >> + #include <mbedtls/sha256.h>
> > > > >> + #include <mbedtls/base64.h>
> > > > >> +
> > > > >> +-#include <mbedtls/certs.h>
> > > > >> + #include <mbedtls/x509.h>
> > > > >> + #include <mbedtls/ssl.h>
> > > > >> +-#include <mbedtls/config.h>
> > > > >> +
> > > > >> + // Posix TLS server context
> > > > >> + struct TLSContext_struct {
> > > > >> +--
> > > > >> +2.34.1
> > > > >> diff --git a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > > >> index 612d343c8..46f1b70cb 100644
> > > > >> --- a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > > >> +++ b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > > >> @@ -21,6 +21,7 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https
> > > > >>             file://0006-Handle-noisy-netlink-sockets.patch \
> > > > >>             file://0007-Mark-deleted-interfaces-as-being-changed.patch \
> > > > >>             file://0008-Handle-errors-from-socket-calls.patch \
> > > > >> +           file://0009-remove-unneeded-headers.patch \
> > > > >>             file://mdns.service \
> > > > >>             "
> > > > >>  SRCREV = "8769ab51605e465425d33d757f602ce5905ca639"
> > > > >> --
> > > > >> 2.25.1
> > > > >>
> > > > >>
> > > > >>
> > > > >>
> > >
> > >
> > >
> > > --
> > > Alex Kiernan
>
>
>
> --
> Alex Kiernan
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#103455): https://lists.openembedded.org/g/openembedded-devel/message/103455
> Mute This Topic: https://lists.openembedded.org/mt/99629056/3618097
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [alex.kiernan@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Beniamin Sandu June 20, 2023, 1:12 p.m. UTC | #12

On Tue, Jun 20, 2023 at 3:42 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
>
> On Tue, Jun 20, 2023 at 1:03 PM Alex Kiernan via
> lists.openembedded.org <alex.kiernan=gmail.com@lists.openembedded.org>
> wrote:
> >
> > On Tue, Jun 20, 2023 at 11:53 AM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
> > >
> > > On Tue, Jun 20, 2023 at 12:56 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> > > >
> > > > On Mon, Jun 19, 2023 at 8:38 PM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
> > > > >
> > > > > I am trying to add a v3.x mbedtls recipe to master branch, and without
> > > >
> > > > Sorry, was reading the thread out of order and missed that you were
> > > > trying to add an Mbed TLS 3 recipe!
> > > >
> > > > > this patch, mdns does not build. I could not find an obvious way to
> > > > > submit upstream patches to mdns from a quick search, otherwise I would
> > > > > gladly do it.
> > > > >
> > > >
> > > > Several folk have tried sending them to dts@apple.com (seemingly
> > > > without success), there's also a couple of attempted PRs on github
> > > > (again seemingly going nowhere). Winding back about 20 years, I tried
> > > > to get a bunch of portability fixes into the Quicktime Streaming
> > > > Server without success - the model appears to very much be open
> > > > source, not open contribution.
> > > >
> > > > > While I am with you on trying to reduce technical debt within yocto
> > > > > layers, this one is very small and rather harmless, so I hope we can
> > > > > make a sacrifice for the greater good. :)
> > > > >
> > > >
> > > > I'm guessing we'll need to scope an Mbed TLS 3 recipe as being
> > > > explicitly mbedtls3_...? So sticking with 2.x doesn't feel like a
> > > > terrible option, but I agree its not ideal.
> > >
> > > This also sounds like a fairly decent option, having a separate
> > > mbedtls3 package might make it easier in general, although I am not
> > > aware of how used the current v2 version actually is.
> > >
> >
> > Looks like we're out of date (there's a 2.28.3), but it's still
> > supported for now... "Mbed TLS 2.28 is a long-time support branch. It
> > will be supported with bug-fixes and security fixes until end of
> > 2024."
> >
>
> Will send an update for 2.28.3, but constrain `devtool upgrade` to
> things on the 2.x branch
>
> One thought on 3.x - if mdns is the only failure maybe rename the
> current recipe to mbedtls2_% and add 3.x as mbedtls_% and then fix up
> the mdns recipe to consume mbedtls2?
>

Personally I would say it is not worth to do it, just because of this
one package. Plus, it's building fine with both versions by including
this small patch, but maybe Khem Raj can chime in with an opinion
here.

> > > >
> > > > My concern isn't really with the one liner now, its the how hard does
> > > > it become to do the upgrades down the road - if we suddenly can't
> > > > upgrade because upstream's stuck on 2.x and there's something
> > > > incompatible with 3.x what do we do?
> > > >
> > > > > Cheers,
> > > > > Beni
> > > > >
> > > > >
> > > > > On Mon, Jun 19, 2023 at 10:14 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> > > > > >
> > > > > > Keeping up with Apple given they take nothing is frankly a right pain, adding things which are nice to have rather than just broken seems like we're just adding to the problem. Last time I resynchronized this it took me days, unless there's a really good reason to do this, or there's a way to get it upstreamed I'd rather we didn't.
> > > > > >
> > > > > >
> > > > > > On Mon, 19 Jun 2023, 19:20 Beniamin Sandu, <beniaminsandu@gmail.com> wrote:
> > > > > >>
> > > > > >> Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> > > > > >> ---
> > > > > >>  .../mdns/0009-remove-unneeded-headers.patch   | 33 +++++++++++++++++++
> > > > > >>  .../recipes-protocols/mdns/mdns_1790.80.10.bb |  1 +
> > > > > >>  2 files changed, 34 insertions(+)
> > > > > >>  create mode 100644 meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > > > >>
> > > > > >> diff --git a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > > > >> new file mode 100644
> > > > > >> index 000000000..74d387368
> > > > > >> --- /dev/null
> > > > > >> +++ b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > > > >> @@ -0,0 +1,33 @@
> > > > > >> +From 1d7e71e72c597ffcc19c04373a477d1fbd3ad955 Mon Sep 17 00:00:00 2001
> > > > > >> +From: Beniamin Sandu <beniaminsandu@gmail.com>
> > > > > >> +Date: Thu, 15 Jun 2023 17:02:58 +0000
> > > > > >> +Subject: [PATCH] remove unneeded headers
> > > > > >> +
> > > > > >> +From a quick look, these seem to not be needed and having them
> > > > > >> +breaks the build with mbedtls 3.x. Without them it builds fine
> > > > > >> +on both 2.x and 3.x versions.
> > > > > >> +
> > > > > >> +Upstream-Status: Pending
> > > > > >> +
> > > > > >> +Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> > > > > >> +---
> > > > > >> + mDNSPosix/mbedtls.c | 2 --
> > > > > >> + 1 file changed, 2 deletions(-)
> > > > > >> +
> > > > > >> +diff --git a/mDNSPosix/mbedtls.c b/mDNSPosix/mbedtls.c
> > > > > >> +index a73681b..ab8f8c7 100644
> > > > > >> +--- a/mDNSPosix/mbedtls.c
> > > > > >> ++++ b/mDNSPosix/mbedtls.c
> > > > > >> +@@ -38,10 +38,8 @@
> > > > > >> + #include <mbedtls/sha256.h>
> > > > > >> + #include <mbedtls/base64.h>
> > > > > >> +
> > > > > >> +-#include <mbedtls/certs.h>
> > > > > >> + #include <mbedtls/x509.h>
> > > > > >> + #include <mbedtls/ssl.h>
> > > > > >> +-#include <mbedtls/config.h>
> > > > > >> +
> > > > > >> + // Posix TLS server context
> > > > > >> + struct TLSContext_struct {
> > > > > >> +--
> > > > > >> +2.34.1
> > > > > >> diff --git a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > > > >> index 612d343c8..46f1b70cb 100644
> > > > > >> --- a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > > > >> +++ b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > > > >> @@ -21,6 +21,7 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https
> > > > > >>             file://0006-Handle-noisy-netlink-sockets.patch \
> > > > > >>             file://0007-Mark-deleted-interfaces-as-being-changed.patch \
> > > > > >>             file://0008-Handle-errors-from-socket-calls.patch \
> > > > > >> +           file://0009-remove-unneeded-headers.patch \
> > > > > >>             file://mdns.service \
> > > > > >>             "
> > > > > >>  SRCREV = "8769ab51605e465425d33d757f602ce5905ca639"
> > > > > >> --
> > > > > >> 2.25.1
> > > > > >>
> > > > > >>
> > > > > >>
> > > > > >>
> > > >
> > > >
> > > >
> > > > --
> > > > Alex Kiernan
> >
> >
> >
> > --
> > Alex Kiernan
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#103455): https://lists.openembedded.org/g/openembedded-devel/message/103455
> > Mute This Topic: https://lists.openembedded.org/mt/99629056/3618097
> > Group Owner: openembedded-devel+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [alex.kiernan@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
>
> --
> Alex Kiernan

Beniamin Sandu June 20, 2023, 4:38 p.m. UTC | #13

On Tue, Jun 20, 2023 at 4:12 PM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
>
> On Tue, Jun 20, 2023 at 3:42 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> >
> > On Tue, Jun 20, 2023 at 1:03 PM Alex Kiernan via
> > lists.openembedded.org <alex.kiernan=gmail.com@lists.openembedded.org>
> > wrote:
> > >
> > > On Tue, Jun 20, 2023 at 11:53 AM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
> > > >
> > > > On Tue, Jun 20, 2023 at 12:56 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> > > > >
> > > > > On Mon, Jun 19, 2023 at 8:38 PM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
> > > > > >
> > > > > > I am trying to add a v3.x mbedtls recipe to master branch, and without
> > > > >
> > > > > Sorry, was reading the thread out of order and missed that you were
> > > > > trying to add an Mbed TLS 3 recipe!
> > > > >
> > > > > > this patch, mdns does not build. I could not find an obvious way to
> > > > > > submit upstream patches to mdns from a quick search, otherwise I would
> > > > > > gladly do it.
> > > > > >
> > > > >
> > > > > Several folk have tried sending them to dts@apple.com (seemingly
> > > > > without success), there's also a couple of attempted PRs on github
> > > > > (again seemingly going nowhere). Winding back about 20 years, I tried
> > > > > to get a bunch of portability fixes into the Quicktime Streaming
> > > > > Server without success - the model appears to very much be open
> > > > > source, not open contribution.
> > > > >
> > > > > > While I am with you on trying to reduce technical debt within yocto
> > > > > > layers, this one is very small and rather harmless, so I hope we can
> > > > > > make a sacrifice for the greater good. :)
> > > > > >
> > > > >
> > > > > I'm guessing we'll need to scope an Mbed TLS 3 recipe as being
> > > > > explicitly mbedtls3_...? So sticking with 2.x doesn't feel like a
> > > > > terrible option, but I agree its not ideal.
> > > >
> > > > This also sounds like a fairly decent option, having a separate
> > > > mbedtls3 package might make it easier in general, although I am not
> > > > aware of how used the current v2 version actually is.
> > > >
> > >
> > > Looks like we're out of date (there's a 2.28.3), but it's still
> > > supported for now... "Mbed TLS 2.28 is a long-time support branch. It
> > > will be supported with bug-fixes and security fixes until end of
> > > 2024."
> > >
> >
> > Will send an update for 2.28.3, but constrain `devtool upgrade` to
> > things on the 2.x branch
> >
> > One thought on 3.x - if mdns is the only failure maybe rename the
> > current recipe to mbedtls2_% and add 3.x as mbedtls_% and then fix up
> > the mdns recipe to consume mbedtls2?
> >
>
> Personally I would say it is not worth to do it, just because of this
> one package. Plus, it's building fine with both versions by including
> this small patch, but maybe Khem Raj can chime in with an opinion
> here.
>

While looking through some stuff, I discovered some variable I had no
idea exists, called DEFAULT_PREFERENCE:
https://docs.yoctoproject.org/ref-manual/variables.html#term-DEFAULT_PREFERENCE

Seems it could be a very simple way to make mbedtls v2 be the
"default" version unless specified by user through PREFERRED_PROVIDER?

> > > > >
> > > > > My concern isn't really with the one liner now, its the how hard does
> > > > > it become to do the upgrades down the road - if we suddenly can't
> > > > > upgrade because upstream's stuck on 2.x and there's something
> > > > > incompatible with 3.x what do we do?
> > > > >
> > > > > > Cheers,
> > > > > > Beni
> > > > > >
> > > > > >
> > > > > > On Mon, Jun 19, 2023 at 10:14 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> > > > > > >
> > > > > > > Keeping up with Apple given they take nothing is frankly a right pain, adding things which are nice to have rather than just broken seems like we're just adding to the problem. Last time I resynchronized this it took me days, unless there's a really good reason to do this, or there's a way to get it upstreamed I'd rather we didn't.
> > > > > > >
> > > > > > >
> > > > > > > On Mon, 19 Jun 2023, 19:20 Beniamin Sandu, <beniaminsandu@gmail.com> wrote:
> > > > > > >>
> > > > > > >> Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> > > > > > >> ---
> > > > > > >>  .../mdns/0009-remove-unneeded-headers.patch   | 33 +++++++++++++++++++
> > > > > > >>  .../recipes-protocols/mdns/mdns_1790.80.10.bb |  1 +
> > > > > > >>  2 files changed, 34 insertions(+)
> > > > > > >>  create mode 100644 meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > > > > >>
> > > > > > >> diff --git a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > > > > >> new file mode 100644
> > > > > > >> index 000000000..74d387368
> > > > > > >> --- /dev/null
> > > > > > >> +++ b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > > > > >> @@ -0,0 +1,33 @@
> > > > > > >> +From 1d7e71e72c597ffcc19c04373a477d1fbd3ad955 Mon Sep 17 00:00:00 2001
> > > > > > >> +From: Beniamin Sandu <beniaminsandu@gmail.com>
> > > > > > >> +Date: Thu, 15 Jun 2023 17:02:58 +0000
> > > > > > >> +Subject: [PATCH] remove unneeded headers
> > > > > > >> +
> > > > > > >> +From a quick look, these seem to not be needed and having them
> > > > > > >> +breaks the build with mbedtls 3.x. Without them it builds fine
> > > > > > >> +on both 2.x and 3.x versions.
> > > > > > >> +
> > > > > > >> +Upstream-Status: Pending
> > > > > > >> +
> > > > > > >> +Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> > > > > > >> +---
> > > > > > >> + mDNSPosix/mbedtls.c | 2 --
> > > > > > >> + 1 file changed, 2 deletions(-)
> > > > > > >> +
> > > > > > >> +diff --git a/mDNSPosix/mbedtls.c b/mDNSPosix/mbedtls.c
> > > > > > >> +index a73681b..ab8f8c7 100644
> > > > > > >> +--- a/mDNSPosix/mbedtls.c
> > > > > > >> ++++ b/mDNSPosix/mbedtls.c
> > > > > > >> +@@ -38,10 +38,8 @@
> > > > > > >> + #include <mbedtls/sha256.h>
> > > > > > >> + #include <mbedtls/base64.h>
> > > > > > >> +
> > > > > > >> +-#include <mbedtls/certs.h>
> > > > > > >> + #include <mbedtls/x509.h>
> > > > > > >> + #include <mbedtls/ssl.h>
> > > > > > >> +-#include <mbedtls/config.h>
> > > > > > >> +
> > > > > > >> + // Posix TLS server context
> > > > > > >> + struct TLSContext_struct {
> > > > > > >> +--
> > > > > > >> +2.34.1
> > > > > > >> diff --git a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > > > > >> index 612d343c8..46f1b70cb 100644
> > > > > > >> --- a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > > > > >> +++ b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > > > > >> @@ -21,6 +21,7 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https
> > > > > > >>             file://0006-Handle-noisy-netlink-sockets.patch \
> > > > > > >>             file://0007-Mark-deleted-interfaces-as-being-changed.patch \
> > > > > > >>             file://0008-Handle-errors-from-socket-calls.patch \
> > > > > > >> +           file://0009-remove-unneeded-headers.patch \
> > > > > > >>             file://mdns.service \
> > > > > > >>             "
> > > > > > >>  SRCREV = "8769ab51605e465425d33d757f602ce5905ca639"
> > > > > > >> --
> > > > > > >> 2.25.1
> > > > > > >>
> > > > > > >>
> > > > > > >>
> > > > > > >>
> > > > >
> > > > >
> > > > >
> > > > > --
> > > > > Alex Kiernan
> > >
> > >
> > >
> > > --
> > > Alex Kiernan
> > >
> > > -=-=-=-=-=-=-=-=-=-=-=-
> > > Links: You receive all messages sent to this group.
> > > View/Reply Online (#103455): https://lists.openembedded.org/g/openembedded-devel/message/103455
> > > Mute This Topic: https://lists.openembedded.org/mt/99629056/3618097
> > > Group Owner: openembedded-devel+owner@lists.openembedded.org
> > > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [alex.kiernan@gmail.com]
> > > -=-=-=-=-=-=-=-=-=-=-=-
> > >
> >
> >
> > --
> > Alex Kiernan

Beniamin Sandu June 20, 2023, 4:41 p.m. UTC | #14

On Tue, Jun 20, 2023 at 7:38 PM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
>
> On Tue, Jun 20, 2023 at 4:12 PM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
> >
> > On Tue, Jun 20, 2023 at 3:42 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> > >
> > > On Tue, Jun 20, 2023 at 1:03 PM Alex Kiernan via
> > > lists.openembedded.org <alex.kiernan=gmail.com@lists.openembedded.org>
> > > wrote:
> > > >
> > > > On Tue, Jun 20, 2023 at 11:53 AM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
> > > > >
> > > > > On Tue, Jun 20, 2023 at 12:56 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> > > > > >
> > > > > > On Mon, Jun 19, 2023 at 8:38 PM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
> > > > > > >
> > > > > > > I am trying to add a v3.x mbedtls recipe to master branch, and without
> > > > > >
> > > > > > Sorry, was reading the thread out of order and missed that you were
> > > > > > trying to add an Mbed TLS 3 recipe!
> > > > > >
> > > > > > > this patch, mdns does not build. I could not find an obvious way to
> > > > > > > submit upstream patches to mdns from a quick search, otherwise I would
> > > > > > > gladly do it.
> > > > > > >
> > > > > >
> > > > > > Several folk have tried sending them to dts@apple.com (seemingly
> > > > > > without success), there's also a couple of attempted PRs on github
> > > > > > (again seemingly going nowhere). Winding back about 20 years, I tried
> > > > > > to get a bunch of portability fixes into the Quicktime Streaming
> > > > > > Server without success - the model appears to very much be open
> > > > > > source, not open contribution.
> > > > > >
> > > > > > > While I am with you on trying to reduce technical debt within yocto
> > > > > > > layers, this one is very small and rather harmless, so I hope we can
> > > > > > > make a sacrifice for the greater good. :)
> > > > > > >
> > > > > >
> > > > > > I'm guessing we'll need to scope an Mbed TLS 3 recipe as being
> > > > > > explicitly mbedtls3_...? So sticking with 2.x doesn't feel like a
> > > > > > terrible option, but I agree its not ideal.
> > > > >
> > > > > This also sounds like a fairly decent option, having a separate
> > > > > mbedtls3 package might make it easier in general, although I am not
> > > > > aware of how used the current v2 version actually is.
> > > > >
> > > >
> > > > Looks like we're out of date (there's a 2.28.3), but it's still
> > > > supported for now... "Mbed TLS 2.28 is a long-time support branch. It
> > > > will be supported with bug-fixes and security fixes until end of
> > > > 2024."
> > > >
> > >
> > > Will send an update for 2.28.3, but constrain `devtool upgrade` to
> > > things on the 2.x branch
> > >
> > > One thought on 3.x - if mdns is the only failure maybe rename the
> > > current recipe to mbedtls2_% and add 3.x as mbedtls_% and then fix up
> > > the mdns recipe to consume mbedtls2?
> > >
> >
> > Personally I would say it is not worth to do it, just because of this
> > one package. Plus, it's building fine with both versions by including
> > this small patch, but maybe Khem Raj can chime in with an opinion
> > here.
> >
>
> While looking through some stuff, I discovered some variable I had no
> idea exists, called DEFAULT_PREFERENCE:
> https://docs.yoctoproject.org/ref-manual/variables.html#term-DEFAULT_PREFERENCE
>
> Seems it could be a very simple way to make mbedtls v2 be the
> "default" version unless specified by user through PREFERRED_PROVIDER?

I meant PREFERRED_VERSION, so we could add this DEFAULT_PREFERENCE to
mbedtls v3 recipe and anyone who wants to use it will need to select
it on their side, otherwise v2 will get built.

>
> > > > > >
> > > > > > My concern isn't really with the one liner now, its the how hard does
> > > > > > it become to do the upgrades down the road - if we suddenly can't
> > > > > > upgrade because upstream's stuck on 2.x and there's something
> > > > > > incompatible with 3.x what do we do?
> > > > > >
> > > > > > > Cheers,
> > > > > > > Beni
> > > > > > >
> > > > > > >
> > > > > > > On Mon, Jun 19, 2023 at 10:14 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> > > > > > > >
> > > > > > > > Keeping up with Apple given they take nothing is frankly a right pain, adding things which are nice to have rather than just broken seems like we're just adding to the problem. Last time I resynchronized this it took me days, unless there's a really good reason to do this, or there's a way to get it upstreamed I'd rather we didn't.
> > > > > > > >
> > > > > > > >
> > > > > > > > On Mon, 19 Jun 2023, 19:20 Beniamin Sandu, <beniaminsandu@gmail.com> wrote:
> > > > > > > >>
> > > > > > > >> Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> > > > > > > >> ---
> > > > > > > >>  .../mdns/0009-remove-unneeded-headers.patch   | 33 +++++++++++++++++++
> > > > > > > >>  .../recipes-protocols/mdns/mdns_1790.80.10.bb |  1 +
> > > > > > > >>  2 files changed, 34 insertions(+)
> > > > > > > >>  create mode 100644 meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > > > > > >>
> > > > > > > >> diff --git a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > > > > > >> new file mode 100644
> > > > > > > >> index 000000000..74d387368
> > > > > > > >> --- /dev/null
> > > > > > > >> +++ b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > > > > > >> @@ -0,0 +1,33 @@
> > > > > > > >> +From 1d7e71e72c597ffcc19c04373a477d1fbd3ad955 Mon Sep 17 00:00:00 2001
> > > > > > > >> +From: Beniamin Sandu <beniaminsandu@gmail.com>
> > > > > > > >> +Date: Thu, 15 Jun 2023 17:02:58 +0000
> > > > > > > >> +Subject: [PATCH] remove unneeded headers
> > > > > > > >> +
> > > > > > > >> +From a quick look, these seem to not be needed and having them
> > > > > > > >> +breaks the build with mbedtls 3.x. Without them it builds fine
> > > > > > > >> +on both 2.x and 3.x versions.
> > > > > > > >> +
> > > > > > > >> +Upstream-Status: Pending
> > > > > > > >> +
> > > > > > > >> +Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> > > > > > > >> +---
> > > > > > > >> + mDNSPosix/mbedtls.c | 2 --
> > > > > > > >> + 1 file changed, 2 deletions(-)
> > > > > > > >> +
> > > > > > > >> +diff --git a/mDNSPosix/mbedtls.c b/mDNSPosix/mbedtls.c
> > > > > > > >> +index a73681b..ab8f8c7 100644
> > > > > > > >> +--- a/mDNSPosix/mbedtls.c
> > > > > > > >> ++++ b/mDNSPosix/mbedtls.c
> > > > > > > >> +@@ -38,10 +38,8 @@
> > > > > > > >> + #include <mbedtls/sha256.h>
> > > > > > > >> + #include <mbedtls/base64.h>
> > > > > > > >> +
> > > > > > > >> +-#include <mbedtls/certs.h>
> > > > > > > >> + #include <mbedtls/x509.h>
> > > > > > > >> + #include <mbedtls/ssl.h>
> > > > > > > >> +-#include <mbedtls/config.h>
> > > > > > > >> +
> > > > > > > >> + // Posix TLS server context
> > > > > > > >> + struct TLSContext_struct {
> > > > > > > >> +--
> > > > > > > >> +2.34.1
> > > > > > > >> diff --git a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > > > > > >> index 612d343c8..46f1b70cb 100644
> > > > > > > >> --- a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > > > > > >> +++ b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > > > > > >> @@ -21,6 +21,7 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https
> > > > > > > >>             file://0006-Handle-noisy-netlink-sockets.patch \
> > > > > > > >>             file://0007-Mark-deleted-interfaces-as-being-changed.patch \
> > > > > > > >>             file://0008-Handle-errors-from-socket-calls.patch \
> > > > > > > >> +           file://0009-remove-unneeded-headers.patch \
> > > > > > > >>             file://mdns.service \
> > > > > > > >>             "
> > > > > > > >>  SRCREV = "8769ab51605e465425d33d757f602ce5905ca639"
> > > > > > > >> --
> > > > > > > >> 2.25.1
> > > > > > > >>
> > > > > > > >>
> > > > > > > >>
> > > > > > > >>
> > > > > >
> > > > > >
> > > > > >
> > > > > > --
> > > > > > Alex Kiernan
> > > >
> > > >
> > > >
> > > > --
> > > > Alex Kiernan
> > > >
> > > > -=-=-=-=-=-=-=-=-=-=-=-
> > > > Links: You receive all messages sent to this group.
> > > > View/Reply Online (#103455): https://lists.openembedded.org/g/openembedded-devel/message/103455
> > > > Mute This Topic: https://lists.openembedded.org/mt/99629056/3618097
> > > > Group Owner: openembedded-devel+owner@lists.openembedded.org
> > > > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [alex.kiernan@gmail.com]
> > > > -=-=-=-=-=-=-=-=-=-=-=-
> > > >
> > >
> > >
> > > --
> > > Alex Kiernan

Alex Kiernan June 20, 2023, 4:43 p.m. UTC | #15

On Tue, Jun 20, 2023 at 5:38 PM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
>
> On Tue, Jun 20, 2023 at 4:12 PM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
> >
> > On Tue, Jun 20, 2023 at 3:42 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> > >
> > > On Tue, Jun 20, 2023 at 1:03 PM Alex Kiernan via
> > > lists.openembedded.org <alex.kiernan=gmail.com@lists.openembedded.org>
> > > wrote:
> > > >
> > > > On Tue, Jun 20, 2023 at 11:53 AM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
> > > > >
> > > > > On Tue, Jun 20, 2023 at 12:56 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> > > > > >
> > > > > > On Mon, Jun 19, 2023 at 8:38 PM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
> > > > > > >
> > > > > > > I am trying to add a v3.x mbedtls recipe to master branch, and without
> > > > > >
> > > > > > Sorry, was reading the thread out of order and missed that you were
> > > > > > trying to add an Mbed TLS 3 recipe!
> > > > > >
> > > > > > > this patch, mdns does not build. I could not find an obvious way to
> > > > > > > submit upstream patches to mdns from a quick search, otherwise I would
> > > > > > > gladly do it.
> > > > > > >
> > > > > >
> > > > > > Several folk have tried sending them to dts@apple.com (seemingly
> > > > > > without success), there's also a couple of attempted PRs on github
> > > > > > (again seemingly going nowhere). Winding back about 20 years, I tried
> > > > > > to get a bunch of portability fixes into the Quicktime Streaming
> > > > > > Server without success - the model appears to very much be open
> > > > > > source, not open contribution.
> > > > > >
> > > > > > > While I am with you on trying to reduce technical debt within yocto
> > > > > > > layers, this one is very small and rather harmless, so I hope we can
> > > > > > > make a sacrifice for the greater good. :)
> > > > > > >
> > > > > >
> > > > > > I'm guessing we'll need to scope an Mbed TLS 3 recipe as being
> > > > > > explicitly mbedtls3_...? So sticking with 2.x doesn't feel like a
> > > > > > terrible option, but I agree its not ideal.
> > > > >
> > > > > This also sounds like a fairly decent option, having a separate
> > > > > mbedtls3 package might make it easier in general, although I am not
> > > > > aware of how used the current v2 version actually is.
> > > > >
> > > >
> > > > Looks like we're out of date (there's a 2.28.3), but it's still
> > > > supported for now... "Mbed TLS 2.28 is a long-time support branch. It
> > > > will be supported with bug-fixes and security fixes until end of
> > > > 2024."
> > > >
> > >
> > > Will send an update for 2.28.3, but constrain `devtool upgrade` to
> > > things on the 2.x branch
> > >
> > > One thought on 3.x - if mdns is the only failure maybe rename the
> > > current recipe to mbedtls2_% and add 3.x as mbedtls_% and then fix up
> > > the mdns recipe to consume mbedtls2?
> > >
> >
> > Personally I would say it is not worth to do it, just because of this
> > one package. Plus, it's building fine with both versions by including
> > this small patch, but maybe Khem Raj can chime in with an opinion
> > here.
> >
>
> While looking through some stuff, I discovered some variable I had no
> idea exists, called DEFAULT_PREFERENCE:
> https://docs.yoctoproject.org/ref-manual/variables.html#term-DEFAULT_PREFERENCE
>
> Seems it could be a very simple way to make mbedtls v2 be the
> "default" version unless specified by user through PREFERRED_PROVIDER?
>

It works, but if you have two recipes with conflicting requirements
(which I do for some other things), it doesn't really help...

Probably I'm leaning towards just upgrading to 3.x and taking the
mDNSResponder patch, I just worry about where Apple go...

> > > > > >
> > > > > > My concern isn't really with the one liner now, its the how hard does
> > > > > > it become to do the upgrades down the road - if we suddenly can't
> > > > > > upgrade because upstream's stuck on 2.x and there's something
> > > > > > incompatible with 3.x what do we do?
> > > > > >
> > > > > > > Cheers,
> > > > > > > Beni
> > > > > > >
> > > > > > >
> > > > > > > On Mon, Jun 19, 2023 at 10:14 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> > > > > > > >
> > > > > > > > Keeping up with Apple given they take nothing is frankly a right pain, adding things which are nice to have rather than just broken seems like we're just adding to the problem. Last time I resynchronized this it took me days, unless there's a really good reason to do this, or there's a way to get it upstreamed I'd rather we didn't.
> > > > > > > >
> > > > > > > >
> > > > > > > > On Mon, 19 Jun 2023, 19:20 Beniamin Sandu, <beniaminsandu@gmail.com> wrote:
> > > > > > > >>
> > > > > > > >> Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> > > > > > > >> ---
> > > > > > > >>  .../mdns/0009-remove-unneeded-headers.patch   | 33 +++++++++++++++++++
> > > > > > > >>  .../recipes-protocols/mdns/mdns_1790.80.10.bb |  1 +
> > > > > > > >>  2 files changed, 34 insertions(+)
> > > > > > > >>  create mode 100644 meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > > > > > >>
> > > > > > > >> diff --git a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > > > > > >> new file mode 100644
> > > > > > > >> index 000000000..74d387368
> > > > > > > >> --- /dev/null
> > > > > > > >> +++ b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > > > > > >> @@ -0,0 +1,33 @@
> > > > > > > >> +From 1d7e71e72c597ffcc19c04373a477d1fbd3ad955 Mon Sep 17 00:00:00 2001
> > > > > > > >> +From: Beniamin Sandu <beniaminsandu@gmail.com>
> > > > > > > >> +Date: Thu, 15 Jun 2023 17:02:58 +0000
> > > > > > > >> +Subject: [PATCH] remove unneeded headers
> > > > > > > >> +
> > > > > > > >> +From a quick look, these seem to not be needed and having them
> > > > > > > >> +breaks the build with mbedtls 3.x. Without them it builds fine
> > > > > > > >> +on both 2.x and 3.x versions.
> > > > > > > >> +
> > > > > > > >> +Upstream-Status: Pending
> > > > > > > >> +
> > > > > > > >> +Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> > > > > > > >> +---
> > > > > > > >> + mDNSPosix/mbedtls.c | 2 --
> > > > > > > >> + 1 file changed, 2 deletions(-)
> > > > > > > >> +
> > > > > > > >> +diff --git a/mDNSPosix/mbedtls.c b/mDNSPosix/mbedtls.c
> > > > > > > >> +index a73681b..ab8f8c7 100644
> > > > > > > >> +--- a/mDNSPosix/mbedtls.c
> > > > > > > >> ++++ b/mDNSPosix/mbedtls.c
> > > > > > > >> +@@ -38,10 +38,8 @@
> > > > > > > >> + #include <mbedtls/sha256.h>
> > > > > > > >> + #include <mbedtls/base64.h>
> > > > > > > >> +
> > > > > > > >> +-#include <mbedtls/certs.h>
> > > > > > > >> + #include <mbedtls/x509.h>
> > > > > > > >> + #include <mbedtls/ssl.h>
> > > > > > > >> +-#include <mbedtls/config.h>
> > > > > > > >> +
> > > > > > > >> + // Posix TLS server context
> > > > > > > >> + struct TLSContext_struct {
> > > > > > > >> +--
> > > > > > > >> +2.34.1
> > > > > > > >> diff --git a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > > > > > >> index 612d343c8..46f1b70cb 100644
> > > > > > > >> --- a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > > > > > >> +++ b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > > > > > >> @@ -21,6 +21,7 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https
> > > > > > > >>             file://0006-Handle-noisy-netlink-sockets.patch \
> > > > > > > >>             file://0007-Mark-deleted-interfaces-as-being-changed.patch \
> > > > > > > >>             file://0008-Handle-errors-from-socket-calls.patch \
> > > > > > > >> +           file://0009-remove-unneeded-headers.patch \
> > > > > > > >>             file://mdns.service \
> > > > > > > >>             "
> > > > > > > >>  SRCREV = "8769ab51605e465425d33d757f602ce5905ca639"
> > > > > > > >> --
> > > > > > > >> 2.25.1
> > > > > > > >>
> > > > > > > >>
> > > > > > > >>
> > > > > > > >>
> > > > > >
> > > > > >
> > > > > >
> > > > > > --
> > > > > > Alex Kiernan
> > > >
> > > >
> > > >
> > > > --
> > > > Alex Kiernan
> > > >
> > > > -=-=-=-=-=-=-=-=-=-=-=-
> > > > Links: You receive all messages sent to this group.
> > > > View/Reply Online (#103455): https://lists.openembedded.org/g/openembedded-devel/message/103455
> > > > Mute This Topic: https://lists.openembedded.org/mt/99629056/3618097
> > > > Group Owner: openembedded-devel+owner@lists.openembedded.org
> > > > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [alex.kiernan@gmail.com]
> > > > -=-=-=-=-=-=-=-=-=-=-=-
> > > >
> > >
> > >
> > > --
> > > Alex Kiernan

Beniamin Sandu June 20, 2023, 4:48 p.m. UTC | #16

On Tue, Jun 20, 2023 at 7:43 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
>
> On Tue, Jun 20, 2023 at 5:38 PM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
> >
> > On Tue, Jun 20, 2023 at 4:12 PM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
> > >
> > > On Tue, Jun 20, 2023 at 3:42 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> > > >
> > > > On Tue, Jun 20, 2023 at 1:03 PM Alex Kiernan via
> > > > lists.openembedded.org <alex.kiernan=gmail.com@lists.openembedded.org>
> > > > wrote:
> > > > >
> > > > > On Tue, Jun 20, 2023 at 11:53 AM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
> > > > > >
> > > > > > On Tue, Jun 20, 2023 at 12:56 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> > > > > > >
> > > > > > > On Mon, Jun 19, 2023 at 8:38 PM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
> > > > > > > >
> > > > > > > > I am trying to add a v3.x mbedtls recipe to master branch, and without
> > > > > > >
> > > > > > > Sorry, was reading the thread out of order and missed that you were
> > > > > > > trying to add an Mbed TLS 3 recipe!
> > > > > > >
> > > > > > > > this patch, mdns does not build. I could not find an obvious way to
> > > > > > > > submit upstream patches to mdns from a quick search, otherwise I would
> > > > > > > > gladly do it.
> > > > > > > >
> > > > > > >
> > > > > > > Several folk have tried sending them to dts@apple.com (seemingly
> > > > > > > without success), there's also a couple of attempted PRs on github
> > > > > > > (again seemingly going nowhere). Winding back about 20 years, I tried
> > > > > > > to get a bunch of portability fixes into the Quicktime Streaming
> > > > > > > Server without success - the model appears to very much be open
> > > > > > > source, not open contribution.
> > > > > > >
> > > > > > > > While I am with you on trying to reduce technical debt within yocto
> > > > > > > > layers, this one is very small and rather harmless, so I hope we can
> > > > > > > > make a sacrifice for the greater good. :)
> > > > > > > >
> > > > > > >
> > > > > > > I'm guessing we'll need to scope an Mbed TLS 3 recipe as being
> > > > > > > explicitly mbedtls3_...? So sticking with 2.x doesn't feel like a
> > > > > > > terrible option, but I agree its not ideal.
> > > > > >
> > > > > > This also sounds like a fairly decent option, having a separate
> > > > > > mbedtls3 package might make it easier in general, although I am not
> > > > > > aware of how used the current v2 version actually is.
> > > > > >
> > > > >
> > > > > Looks like we're out of date (there's a 2.28.3), but it's still
> > > > > supported for now... "Mbed TLS 2.28 is a long-time support branch. It
> > > > > will be supported with bug-fixes and security fixes until end of
> > > > > 2024."
> > > > >
> > > >
> > > > Will send an update for 2.28.3, but constrain `devtool upgrade` to
> > > > things on the 2.x branch
> > > >
> > > > One thought on 3.x - if mdns is the only failure maybe rename the
> > > > current recipe to mbedtls2_% and add 3.x as mbedtls_% and then fix up
> > > > the mdns recipe to consume mbedtls2?
> > > >
> > >
> > > Personally I would say it is not worth to do it, just because of this
> > > one package. Plus, it's building fine with both versions by including
> > > this small patch, but maybe Khem Raj can chime in with an opinion
> > > here.
> > >
> >
> > While looking through some stuff, I discovered some variable I had no
> > idea exists, called DEFAULT_PREFERENCE:
> > https://docs.yoctoproject.org/ref-manual/variables.html#term-DEFAULT_PREFERENCE
> >
> > Seems it could be a very simple way to make mbedtls v2 be the
> > "default" version unless specified by user through PREFERRED_PROVIDER?
> >
>
> It works, but if you have two recipes with conflicting requirements
> (which I do for some other things), it doesn't really help...
>
> Probably I'm leaning towards just upgrading to 3.x and taking the
> mDNSResponder patch, I just worry about where Apple go...

Right, then I think we just take in the patch and move on. I would be
surprised if this one specifically will generate problems in the
future, but we can deal with it at the time.

>
> > > > > > >
> > > > > > > My concern isn't really with the one liner now, its the how hard does
> > > > > > > it become to do the upgrades down the road - if we suddenly can't
> > > > > > > upgrade because upstream's stuck on 2.x and there's something
> > > > > > > incompatible with 3.x what do we do?
> > > > > > >
> > > > > > > > Cheers,
> > > > > > > > Beni
> > > > > > > >
> > > > > > > >
> > > > > > > > On Mon, Jun 19, 2023 at 10:14 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> > > > > > > > >
> > > > > > > > > Keeping up with Apple given they take nothing is frankly a right pain, adding things which are nice to have rather than just broken seems like we're just adding to the problem. Last time I resynchronized this it took me days, unless there's a really good reason to do this, or there's a way to get it upstreamed I'd rather we didn't.
> > > > > > > > >
> > > > > > > > >
> > > > > > > > > On Mon, 19 Jun 2023, 19:20 Beniamin Sandu, <beniaminsandu@gmail.com> wrote:
> > > > > > > > >>
> > > > > > > > >> Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> > > > > > > > >> ---
> > > > > > > > >>  .../mdns/0009-remove-unneeded-headers.patch   | 33 +++++++++++++++++++
> > > > > > > > >>  .../recipes-protocols/mdns/mdns_1790.80.10.bb |  1 +
> > > > > > > > >>  2 files changed, 34 insertions(+)
> > > > > > > > >>  create mode 100644 meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > > > > > > >>
> > > > > > > > >> diff --git a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > > > > > > >> new file mode 100644
> > > > > > > > >> index 000000000..74d387368
> > > > > > > > >> --- /dev/null
> > > > > > > > >> +++ b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > > > > > > >> @@ -0,0 +1,33 @@
> > > > > > > > >> +From 1d7e71e72c597ffcc19c04373a477d1fbd3ad955 Mon Sep 17 00:00:00 2001
> > > > > > > > >> +From: Beniamin Sandu <beniaminsandu@gmail.com>
> > > > > > > > >> +Date: Thu, 15 Jun 2023 17:02:58 +0000
> > > > > > > > >> +Subject: [PATCH] remove unneeded headers
> > > > > > > > >> +
> > > > > > > > >> +From a quick look, these seem to not be needed and having them
> > > > > > > > >> +breaks the build with mbedtls 3.x. Without them it builds fine
> > > > > > > > >> +on both 2.x and 3.x versions.
> > > > > > > > >> +
> > > > > > > > >> +Upstream-Status: Pending
> > > > > > > > >> +
> > > > > > > > >> +Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> > > > > > > > >> +---
> > > > > > > > >> + mDNSPosix/mbedtls.c | 2 --
> > > > > > > > >> + 1 file changed, 2 deletions(-)
> > > > > > > > >> +
> > > > > > > > >> +diff --git a/mDNSPosix/mbedtls.c b/mDNSPosix/mbedtls.c
> > > > > > > > >> +index a73681b..ab8f8c7 100644
> > > > > > > > >> +--- a/mDNSPosix/mbedtls.c
> > > > > > > > >> ++++ b/mDNSPosix/mbedtls.c
> > > > > > > > >> +@@ -38,10 +38,8 @@
> > > > > > > > >> + #include <mbedtls/sha256.h>
> > > > > > > > >> + #include <mbedtls/base64.h>
> > > > > > > > >> +
> > > > > > > > >> +-#include <mbedtls/certs.h>
> > > > > > > > >> + #include <mbedtls/x509.h>
> > > > > > > > >> + #include <mbedtls/ssl.h>
> > > > > > > > >> +-#include <mbedtls/config.h>
> > > > > > > > >> +
> > > > > > > > >> + // Posix TLS server context
> > > > > > > > >> + struct TLSContext_struct {
> > > > > > > > >> +--
> > > > > > > > >> +2.34.1
> > > > > > > > >> diff --git a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > > > > > > >> index 612d343c8..46f1b70cb 100644
> > > > > > > > >> --- a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > > > > > > >> +++ b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > > > > > > >> @@ -21,6 +21,7 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https
> > > > > > > > >>             file://0006-Handle-noisy-netlink-sockets.patch \
> > > > > > > > >>             file://0007-Mark-deleted-interfaces-as-being-changed.patch \
> > > > > > > > >>             file://0008-Handle-errors-from-socket-calls.patch \
> > > > > > > > >> +           file://0009-remove-unneeded-headers.patch \
> > > > > > > > >>             file://mdns.service \
> > > > > > > > >>             "
> > > > > > > > >>  SRCREV = "8769ab51605e465425d33d757f602ce5905ca639"
> > > > > > > > >> --
> > > > > > > > >> 2.25.1
> > > > > > > > >>
> > > > > > > > >>
> > > > > > > > >>
> > > > > > > > >>
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > > --
> > > > > > > Alex Kiernan
> > > > >
> > > > >
> > > > >
> > > > > --
> > > > > Alex Kiernan
> > > > >
> > > > > -=-=-=-=-=-=-=-=-=-=-=-
> > > > > Links: You receive all messages sent to this group.
> > > > > View/Reply Online (#103455): https://lists.openembedded.org/g/openembedded-devel/message/103455
> > > > > Mute This Topic: https://lists.openembedded.org/mt/99629056/3618097
> > > > > Group Owner: openembedded-devel+owner@lists.openembedded.org
> > > > > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [alex.kiernan@gmail.com]
> > > > > -=-=-=-=-=-=-=-=-=-=-=-
> > > > >
> > > >
> > > >
> > > > --
> > > > Alex Kiernan
>
>
>
> --
> Alex Kiernan

Khem Raj June 20, 2023, 6:11 p.m. UTC | #17

On Tue, Jun 20, 2023 at 9:43 AM Alex Kiernan <alex.kiernan@gmail.com> wrote:
>
> On Tue, Jun 20, 2023 at 5:38 PM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
> >
> > On Tue, Jun 20, 2023 at 4:12 PM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
> > >
> > > On Tue, Jun 20, 2023 at 3:42 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> > > >
> > > > On Tue, Jun 20, 2023 at 1:03 PM Alex Kiernan via
> > > > lists.openembedded.org <alex.kiernan=gmail.com@lists.openembedded.org>
> > > > wrote:
> > > > >
> > > > > On Tue, Jun 20, 2023 at 11:53 AM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
> > > > > >
> > > > > > On Tue, Jun 20, 2023 at 12:56 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> > > > > > >
> > > > > > > On Mon, Jun 19, 2023 at 8:38 PM Beniamin Sandu <beniaminsandu@gmail.com> wrote:
> > > > > > > >
> > > > > > > > I am trying to add a v3.x mbedtls recipe to master branch, and without
> > > > > > >
> > > > > > > Sorry, was reading the thread out of order and missed that you were
> > > > > > > trying to add an Mbed TLS 3 recipe!
> > > > > > >
> > > > > > > > this patch, mdns does not build. I could not find an obvious way to
> > > > > > > > submit upstream patches to mdns from a quick search, otherwise I would
> > > > > > > > gladly do it.
> > > > > > > >
> > > > > > >
> > > > > > > Several folk have tried sending them to dts@apple.com (seemingly
> > > > > > > without success), there's also a couple of attempted PRs on github
> > > > > > > (again seemingly going nowhere). Winding back about 20 years, I tried
> > > > > > > to get a bunch of portability fixes into the Quicktime Streaming
> > > > > > > Server without success - the model appears to very much be open
> > > > > > > source, not open contribution.
> > > > > > >
> > > > > > > > While I am with you on trying to reduce technical debt within yocto
> > > > > > > > layers, this one is very small and rather harmless, so I hope we can
> > > > > > > > make a sacrifice for the greater good. :)
> > > > > > > >
> > > > > > >
> > > > > > > I'm guessing we'll need to scope an Mbed TLS 3 recipe as being
> > > > > > > explicitly mbedtls3_...? So sticking with 2.x doesn't feel like a
> > > > > > > terrible option, but I agree its not ideal.
> > > > > >
> > > > > > This also sounds like a fairly decent option, having a separate
> > > > > > mbedtls3 package might make it easier in general, although I am not
> > > > > > aware of how used the current v2 version actually is.
> > > > > >
> > > > >
> > > > > Looks like we're out of date (there's a 2.28.3), but it's still
> > > > > supported for now... "Mbed TLS 2.28 is a long-time support branch. It
> > > > > will be supported with bug-fixes and security fixes until end of
> > > > > 2024."
> > > > >
> > > >
> > > > Will send an update for 2.28.3, but constrain `devtool upgrade` to
> > > > things on the 2.x branch
> > > >
> > > > One thought on 3.x - if mdns is the only failure maybe rename the
> > > > current recipe to mbedtls2_% and add 3.x as mbedtls_% and then fix up
> > > > the mdns recipe to consume mbedtls2?
> > > >
> > >
> > > Personally I would say it is not worth to do it, just because of this
> > > one package. Plus, it's building fine with both versions by including
> > > this small patch, but maybe Khem Raj can chime in with an opinion
> > > here.

yeah, I agree. Its better to maintain one version if we can.

> > >
> >
> > While looking through some stuff, I discovered some variable I had no
> > idea exists, called DEFAULT_PREFERENCE:
> > https://docs.yoctoproject.org/ref-manual/variables.html#term-DEFAULT_PREFERENCE
> >
> > Seems it could be a very simple way to make mbedtls v2 be the
> > "default" version unless specified by user through PREFERRED_PROVIDER?
> >
>
> It works, but if you have two recipes with conflicting requirements
> (which I do for some other things), it doesn't really help...
>
> Probably I'm leaning towards just upgrading to 3.x and taking the
> mDNSResponder patch, I just worry about where Apple go...
>
> > > > > > >
> > > > > > > My concern isn't really with the one liner now, its the how hard does
> > > > > > > it become to do the upgrades down the road - if we suddenly can't
> > > > > > > upgrade because upstream's stuck on 2.x and there's something
> > > > > > > incompatible with 3.x what do we do?
> > > > > > >
> > > > > > > > Cheers,
> > > > > > > > Beni
> > > > > > > >
> > > > > > > >
> > > > > > > > On Mon, Jun 19, 2023 at 10:14 PM Alex Kiernan <alex.kiernan@gmail.com> wrote:
> > > > > > > > >
> > > > > > > > > Keeping up with Apple given they take nothing is frankly a right pain, adding things which are nice to have rather than just broken seems like we're just adding to the problem. Last time I resynchronized this it took me days, unless there's a really good reason to do this, or there's a way to get it upstreamed I'd rather we didn't.
> > > > > > > > >
> > > > > > > > >
> > > > > > > > > On Mon, 19 Jun 2023, 19:20 Beniamin Sandu, <beniaminsandu@gmail.com> wrote:
> > > > > > > > >>
> > > > > > > > >> Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> > > > > > > > >> ---
> > > > > > > > >>  .../mdns/0009-remove-unneeded-headers.patch   | 33 +++++++++++++++++++
> > > > > > > > >>  .../recipes-protocols/mdns/mdns_1790.80.10.bb |  1 +
> > > > > > > > >>  2 files changed, 34 insertions(+)
> > > > > > > > >>  create mode 100644 meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > > > > > > >>
> > > > > > > > >> diff --git a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > > > > > > >> new file mode 100644
> > > > > > > > >> index 000000000..74d387368
> > > > > > > > >> --- /dev/null
> > > > > > > > >> +++ b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
> > > > > > > > >> @@ -0,0 +1,33 @@
> > > > > > > > >> +From 1d7e71e72c597ffcc19c04373a477d1fbd3ad955 Mon Sep 17 00:00:00 2001
> > > > > > > > >> +From: Beniamin Sandu <beniaminsandu@gmail.com>
> > > > > > > > >> +Date: Thu, 15 Jun 2023 17:02:58 +0000
> > > > > > > > >> +Subject: [PATCH] remove unneeded headers
> > > > > > > > >> +
> > > > > > > > >> +From a quick look, these seem to not be needed and having them
> > > > > > > > >> +breaks the build with mbedtls 3.x. Without them it builds fine
> > > > > > > > >> +on both 2.x and 3.x versions.
> > > > > > > > >> +
> > > > > > > > >> +Upstream-Status: Pending
> > > > > > > > >> +
> > > > > > > > >> +Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
> > > > > > > > >> +---
> > > > > > > > >> + mDNSPosix/mbedtls.c | 2 --
> > > > > > > > >> + 1 file changed, 2 deletions(-)
> > > > > > > > >> +
> > > > > > > > >> +diff --git a/mDNSPosix/mbedtls.c b/mDNSPosix/mbedtls.c
> > > > > > > > >> +index a73681b..ab8f8c7 100644
> > > > > > > > >> +--- a/mDNSPosix/mbedtls.c
> > > > > > > > >> ++++ b/mDNSPosix/mbedtls.c
> > > > > > > > >> +@@ -38,10 +38,8 @@
> > > > > > > > >> + #include <mbedtls/sha256.h>
> > > > > > > > >> + #include <mbedtls/base64.h>
> > > > > > > > >> +
> > > > > > > > >> +-#include <mbedtls/certs.h>
> > > > > > > > >> + #include <mbedtls/x509.h>
> > > > > > > > >> + #include <mbedtls/ssl.h>
> > > > > > > > >> +-#include <mbedtls/config.h>
> > > > > > > > >> +
> > > > > > > > >> + // Posix TLS server context
> > > > > > > > >> + struct TLSContext_struct {
> > > > > > > > >> +--
> > > > > > > > >> +2.34.1
> > > > > > > > >> diff --git a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > > > > > > >> index 612d343c8..46f1b70cb 100644
> > > > > > > > >> --- a/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > > > > > > >> +++ b/meta-networking/recipes-protocols/mdns/mdns_1790.80.10.bb
> > > > > > > > >> @@ -21,6 +21,7 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https
> > > > > > > > >>             file://0006-Handle-noisy-netlink-sockets.patch \
> > > > > > > > >>             file://0007-Mark-deleted-interfaces-as-being-changed.patch \
> > > > > > > > >>             file://0008-Handle-errors-from-socket-calls.patch \
> > > > > > > > >> +           file://0009-remove-unneeded-headers.patch \
> > > > > > > > >>             file://mdns.service \
> > > > > > > > >>             "
> > > > > > > > >>  SRCREV = "8769ab51605e465425d33d757f602ce5905ca639"
> > > > > > > > >> --
> > > > > > > > >> 2.25.1
> > > > > > > > >>
> > > > > > > > >>
> > > > > > > > >>
> > > > > > > > >>
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > > --
> > > > > > > Alex Kiernan
> > > > >
> > > > >
> > > > >
> > > > > --
> > > > > Alex Kiernan
> > > > >
> > > > >
> > > > >
> > > >
> > > >
> > > > --
> > > > Alex Kiernan
>
>
>
> --
> Alex Kiernan
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#103462): https://lists.openembedded.org/g/openembedded-devel/message/103462
> Mute This Topic: https://lists.openembedded.org/mt/99629056/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

[meta-networking] mdns: remove unneeded headers

Commit Message

Comments

Patch