CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

mdns: Upgrade 2600.140.3 -> 2881.0.25

Browse Source 
Convert systemd unit to use `-foreground` option removing the need for
the PID file. Also fix `Pending` Upstream-Status to make clear that
upstream doesn't take patches.

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Alex Kiernan 2025-10-24 08:25:21 +01:00 committed by Khem Raj
parent 2278f23482
commit 10f09e4054
10 changed files with 25 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-networking/recipes-protocols/mdns/mdns/0001-Fix-build-with-gcc-15.patch
View File

@ -1,4 +1,4 @@
From 4f7a50fa0b9ecc177a54e84eca3c98207cb623ac Mon Sep 17 00:00:00 2001
From c84f185f29d0839b97177aecb0a78b9717947973 Mon Sep 17 00:00:00 2001
From: Nguyen Dat Tho <tho3.nguyen@lge.com>
Date: Wed, 9 Apr 2025 13:05:24 +0900
Subject: [PATCH] Fix build with gcc-15

30
meta-networking/recipes-protocols/mdns/mdns/0001-Use-secure_getenv-on-Linux.patch
View File

@ -1,30 +0,0 @@
From 3d4d517fe8924696584e84b953ab22f496b371be Mon Sep 17 00:00:00 2001
From: Alex Kiernan <alex.kiernan@gmail.com>
Date: Tue, 27 May 2025 13:33:30 +0100
Subject: [PATCH] Use secure_getenv on Linux
Upstream-Status: Inactive-Upstream [Upstream does not take patches]
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
---
mDNSShared/dnssd_clientstub.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/mDNSShared/dnssd_clientstub.c b/mDNSShared/dnssd_clientstub.c
index 6667276ee33a..e7b51813664e 100644
--- a/mDNSShared/dnssd_clientstub.c
+++ b/mDNSShared/dnssd_clientstub.c
@@ -801,10 +801,14 @@ static DNSServiceErrorType ConnectToServer(DNSServiceRef *ref, DNSServiceFlags f
#endif
#ifndef USE_TCP_LOOPBACK
char* uds_serverpath = NULL;
+#ifdef TARGET_OS_LINUX
+ uds_serverpath = secure_getenv(MDNS_UDS_SERVERPATH_ENVVAR);
+#else
if (!issetugid())
{
uds_serverpath = getenv(MDNS_UDS_SERVERPATH_ENVVAR);
}
+#endif
if (uds_serverpath == NULL)
uds_serverpath = MDNS_UDS_SERVERPATH;
else if (strlen(uds_serverpath) >= MAX_CTLPATH)

4
meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch
View File

@ -1,11 +1,11 @@
From 2e18dbd9c8ff3e48270fde2ba46b44e94ebdb439 Mon Sep 17 00:00:00 2001
From cdbc28c668dd627906f833f9a8e32ac53b0b0139 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 4 Nov 2021 07:31:32 -0700
Subject: [PATCH] dns-sd: Include missing headers
Fixes build on Musl
Upstream-Status: Pending
Upstream-Status: Inactive-Upstream [Upstream does not take patches]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
mDNSPosix/nss_mdns.c | 3 +++

4
meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch
View File

@ -1,9 +1,9 @@
From aedffca94035f7a16303fb4f90cba19c0df1ca2e Mon Sep 17 00:00:00 2001
From dcc1f39a0918cdebf53ac7c105b3d33df960ed14 Mon Sep 17 00:00:00 2001
From: Alex Kiernan <alex.kiernan@gmail.com>
Date: Mon, 5 Dec 2022 15:14:12 +0000
Subject: [PATCH] make: Set libdns_sd.so soname correctly
Upstream-Status: Pending
Upstream-Status: Inactive-Upstream [Upstream does not take patches]
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
---
mDNSPosix/Makefile | 2 +-

4
meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch
View File

@ -1,4 +1,4 @@
From 74f0969c4f092d92c4fc6440c27707c2a5cbfe97 Mon Sep 17 00:00:00 2001
From f7ee12c1f8e85b9d2fe4023b6539c8051dc710c3 Mon Sep 17 00:00:00 2001
From: Alex Kiernan <alex.kiernan@gmail.com>
Date: Mon, 5 Dec 2022 15:14:26 +0000
Subject: [PATCH] make: Separate TLS targets from libraries
@ -6,7 +6,7 @@ Subject: [PATCH] make: Separate TLS targets from libraries
There are dependencies on TLSOBJS, which fails when `-lmbedtls` is
listed as a dependency, so separate it out.
Upstream-Status: Pending
Upstream-Status: Inactive-Upstream [Upstream does not take patches]
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
---
mDNSPosix/Makefile | 14 ++++++++------

18
meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch
View File

@ -1,22 +1,22 @@
From 224884989226b9d7980c0f09d895c3e0dc48c47a Mon Sep 17 00:00:00 2001
From e79f75487e32f87677519ec40c021b1623395bde Mon Sep 17 00:00:00 2001
From: Alex Kiernan <alex.kiernan@gmail.com>
Date: Mon, 5 Dec 2022 22:49:49 +0000
Subject: [PATCH] mDNSCore: Fix broken debug parameter
Upstream-Status: Pending
Upstream-Status: Inactive-Upstream [Upstream does not take patches]
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
---
mDNSCore/mDNS.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mDNSCore/mDNS.c b/mDNSCore/mDNS.c
index 2a6f9d5b28f3..2bdd78e351d9 100644
--- a/mDNSCore/mDNS.c
+++ b/mDNSCore/mDNS.c
@@ -11046,7 +11046,7 @@ mDNSlocal void mDNSCoreReceiveNoUnicastAnswers(mDNS *const m, const DNSMessage *
#else
Index: mDNSResponder/mDNSCore/mDNS.c
===================================================================
--- mDNSResponder.orig/mDNSCore/mDNS.c
+++ mDNSResponder/mDNSCore/mDNS.c
@@ -9481,7 +9481,7 @@ mDNSlocal void mDNSCoreReceiveNoUnicastA
{
CacheRecord *negcr;
const DNSServRef dnsserv = qptr->qDNSServer;
#endif
- debugf("mDNSCoreReceiveNoUnicastAnswers making negative cache entry TTL %d for %##s (%s)", negttl, currentQName, DNSTypeName(q.qtype));
+ debugf("mDNSCoreReceiveNoUnicastAnswers making negative cache entry TTL %d for %##s (%s)", negttl, currentQName->c, DNSTypeName(q.qtype));
// Create a negative record for the current name in the CNAME chain.

14
meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch
View File

@ -1,4 +1,4 @@
From 41819656682c8ab68d1181a5ee39634df7630de3 Mon Sep 17 00:00:00 2001
From a1c982808ebfb71ba7e0f16040013b7127a6e2ab Mon Sep 17 00:00:00 2001
From: Alex Kiernan <alex.kiernan@gmail.com>
Date: Tue, 6 Dec 2022 13:28:31 +0000
Subject: [PATCH] make: Add top-level Makefile
@ -8,19 +8,15 @@ Simple top level Makefile that just delegates to mDNSPosix.
Upstream-Status: Inappropriate [oe-specific]
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
---
Makefile | 6 ++++++
1 file changed, 6 insertions(+)
Makefile | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 Makefile
diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000000..2fe39ad8938a
index 000000000000..feb6ac67ef47
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,6 @@
+# We install a stub Makefile in the top directory so that the various checks
+# in base.bbclass pass their tests for a Makefile, this ensures (that amongst
+# other things) the sstate checks will clean the build directory when the
+# task hashes changes.
@@ -0,0 +1,2 @@
+all clean:
+ cd mDNSPosix && $(MAKE) $@

30
meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
View File

@ -1,30 +0,0 @@
From 43b82963a79250b19c94e15d0a86b04a5cffc0e1 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: Inactive-Upstream [Upstream does not take patches]
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 a73681b6d528..ab8f8c772c00 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 {

6
meta-networking/recipes-protocols/mdns/mdns/mdns.service
View File

@ -3,11 +3,9 @@ Description=Zero-configuration networking
After=network.target
[Service]
Type=forking
ExecStartPre=/bin/rm -f /var/run/mdnsd.pid
ExecStart=/usr/sbin/mdnsd
Type=exec
ExecStart=/usr/sbin/mdnsd -foreground
ExecReload=/bin/kill -HUP $MAINPID
PIDFile=/var/run/mdnsd.pid
Restart=always
RestartSec=10s

6
meta-networking/recipes-protocols/mdns/mdns_2600.140.3.bb → meta-networking/recipes-protocols/mdns/mdns_2881.0.25.bb
View File

@ -12,13 +12,11 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https
file://0004-make-Separate-TLS-targets-from-libraries.patch \
file://0005-mDNSCore-Fix-broken-debug-parameter.patch \
file://0006-make-Add-top-level-Makefile.patch \
file://0009-remove-unneeded-headers.patch \
file://0001-Fix-build-with-gcc-15.patch \
file://0001-Use-secure_getenv-on-Linux.patch \
file://mdns.service \
"
BRANCH = "rel/mDNSResponder-2600"
SRCREV = "62914d23f299cf336a8647fb3a1b5b78647b3b41"
BRANCH = "main"
SRCREV = "d4658af3f5f291311c6aee4210aa6d39bda82bbe"
inherit github-releases manpages systemd update-rc.d