From fdc07c4469d94229138436e216214f7e85e3a868 Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Sat, 21 Mar 2026 21:47:10 +0000 Subject: [PATCH] mdns: Upgrade 2881.0.25 -> 2881.80.4.0.1 Add new patch to fix breakage from Apple Wireless Direct Link support on macOS. Signed-off-by: Alex Kiernan Signed-off-by: Khem Raj --- .../mdns/0001-Fix-build-with-gcc-15.patch | 2 +- .../0001-dns-sd-Include-missing-headers.patch | 2 +- ...ke-Set-libdns_sd.so-soname-correctly.patch | 4 +-- ...-Separate-TLS-targets-from-libraries.patch | 4 +-- ...-mDNSCore-Fix-broken-debug-parameter.patch | 12 ++++----- .../0006-make-Add-top-level-Makefile.patch | 2 +- ...Apple-Wireless-Direct-Link-depend-on.patch | 27 +++++++++++++++++++ ...dns_2881.0.25.bb => mdns_2881.80.4.0.1.bb} | 5 ++-- 8 files changed, 43 insertions(+), 15 deletions(-) create mode 100644 meta-networking/recipes-protocols/mdns/mdns/0007-mDNSShared-Make-Apple-Wireless-Direct-Link-depend-on.patch rename meta-networking/recipes-protocols/mdns/{mdns_2881.0.25.bb => mdns_2881.80.4.0.1.bb} (96%) diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-build-with-gcc-15.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-build-with-gcc-15.patch index af33d5444c..c232685a15 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-build-with-gcc-15.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-build-with-gcc-15.patch @@ -1,4 +1,4 @@ -From c84f185f29d0839b97177aecb0a78b9717947973 Mon Sep 17 00:00:00 2001 +From 0ec55ecaa7386f924ee3d64fdfbe1c2d0df1341a Mon Sep 17 00:00:00 2001 From: Nguyen Dat Tho Date: Wed, 9 Apr 2025 13:05:24 +0900 Subject: [PATCH] Fix build with gcc-15 diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch index 5464e3febe..c9929db4ca 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch @@ -1,4 +1,4 @@ -From cdbc28c668dd627906f833f9a8e32ac53b0b0139 Mon Sep 17 00:00:00 2001 +From 18b1239b7abd289fe5275fddc2545727a956a4ad Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 4 Nov 2021 07:31:32 -0700 Subject: [PATCH] dns-sd: Include missing headers diff --git a/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch b/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch index f547c64d93..5f91e91b1d 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch @@ -1,4 +1,4 @@ -From dcc1f39a0918cdebf53ac7c105b3d33df960ed14 Mon Sep 17 00:00:00 2001 +From 7319d6c328d7b18a048e9855902e180fe23641a2 Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Mon, 5 Dec 2022 15:14:12 +0000 Subject: [PATCH] make: Set libdns_sd.so soname correctly @@ -10,7 +10,7 @@ Signed-off-by: Alex Kiernan 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mDNSPosix/Makefile b/mDNSPosix/Makefile -index e05ba10b4340..7c510317f1b6 100755 +index 22789f0368c7..2bb57eae5659 100755 --- a/mDNSPosix/Makefile +++ b/mDNSPosix/Makefile @@ -276,7 +276,7 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$(LDSUFFIX) diff --git a/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch b/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch index 2969b5e244..b6697f0ba6 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch @@ -1,4 +1,4 @@ -From f7ee12c1f8e85b9d2fe4023b6539c8051dc710c3 Mon Sep 17 00:00:00 2001 +From e27ac4bb6243b33d23ccb7a137983887676fda7f Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Mon, 5 Dec 2022 15:14:26 +0000 Subject: [PATCH] make: Separate TLS targets from libraries @@ -13,7 +13,7 @@ Signed-off-by: Alex Kiernan 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/mDNSPosix/Makefile b/mDNSPosix/Makefile -index 7c510317f1b6..8dd5984020ee 100755 +index 2bb57eae5659..490165561410 100755 --- a/mDNSPosix/Makefile +++ b/mDNSPosix/Makefile @@ -112,9 +112,11 @@ ifeq ($(findstring linux,$(os)),linux) diff --git a/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch b/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch index 0c1a9f373f..b8929ea439 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch @@ -1,4 +1,4 @@ -From e79f75487e32f87677519ec40c021b1623395bde Mon Sep 17 00:00:00 2001 +From ab62d343d7e13ae79b0445a0b3d0954ba3534a0c Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Mon, 5 Dec 2022 22:49:49 +0000 Subject: [PATCH] mDNSCore: Fix broken debug parameter @@ -9,11 +9,11 @@ Signed-off-by: Alex Kiernan mDNSCore/mDNS.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: mDNSResponder/mDNSCore/mDNS.c -=================================================================== ---- mDNSResponder.orig/mDNSCore/mDNS.c -+++ mDNSResponder/mDNSCore/mDNS.c -@@ -9481,7 +9481,7 @@ mDNSlocal void mDNSCoreReceiveNoUnicastA +diff --git a/mDNSCore/mDNS.c b/mDNSCore/mDNS.c +index 08bfafb11d8d..079c9742e419 100644 +--- a/mDNSCore/mDNS.c ++++ b/mDNSCore/mDNS.c +@@ -9481,7 +9481,7 @@ mDNSlocal void mDNSCoreReceiveNoUnicastAnswers(mDNS *const m, const DNSMessage * { CacheRecord *negcr; const DNSServRef dnsserv = qptr->qDNSServer; diff --git a/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch b/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch index 5f8f428302..87b163f1e2 100644 --- a/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch +++ b/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch @@ -1,4 +1,4 @@ -From a1c982808ebfb71ba7e0f16040013b7127a6e2ab Mon Sep 17 00:00:00 2001 +From a90eacb0f42e4ac63fe8c0ab624e8af7d9d47bd1 Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Tue, 6 Dec 2022 13:28:31 +0000 Subject: [PATCH] make: Add top-level Makefile diff --git a/meta-networking/recipes-protocols/mdns/mdns/0007-mDNSShared-Make-Apple-Wireless-Direct-Link-depend-on.patch b/meta-networking/recipes-protocols/mdns/mdns/0007-mDNSShared-Make-Apple-Wireless-Direct-Link-depend-on.patch new file mode 100644 index 0000000000..7a47ddd789 --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/mdns/0007-mDNSShared-Make-Apple-Wireless-Direct-Link-depend-on.patch @@ -0,0 +1,27 @@ +From eac5e89c884b4dd28a80f77d2c447a398e8db94f Mon Sep 17 00:00:00 2001 +From: Alex Kiernan +Date: Sat, 21 Mar 2026 20:12:39 +0000 +Subject: [PATCH] mDNSShared: Make Apple Wireless Direct Link depend on macOS + +Upstream-Status: Inactive-Upstream [Upstream does not take patches] +Signed-off-by: Alex Kiernan +--- + mDNSShared/uds_daemon.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/mDNSShared/uds_daemon.c b/mDNSShared/uds_daemon.c +index 6486f1ed51dd..3113313191d7 100644 +--- a/mDNSShared/uds_daemon.c ++++ b/mDNSShared/uds_daemon.c +@@ -3626,7 +3626,11 @@ mDNSlocal void resolve_result_callback(mDNS *const m, DNSQuestion *question, con + request_state *const req = question->QuestionContext; + const mDNSu32 name_hash = mDNS_DomainNameFNV1aHash(&question->qname); + const mDNSBool isMDNSQuestion = mDNSOpaque16IsZero(question->TargetQID); ++#if MDNS_OS(macOS) + const mDNSBool is_split_awdl_query = (req->resolve_awdl && question->InterfaceID == AWDLInterfaceID); ++#else ++ const mDNSBool is_split_awdl_query = mDNSfalse; ++#endif + UDS_LOG_ANSWER_EVENT(isMDNSQuestion ? MDNS_LOG_CATEGORY_MDNS : MDNS_LOG_CATEGORY_DEFAULT, MDNS_LOG_DEFAULT, + req, question, answer, mDNSfalse, "DNSServiceResolve result", AddRecord); + diff --git a/meta-networking/recipes-protocols/mdns/mdns_2881.0.25.bb b/meta-networking/recipes-protocols/mdns/mdns_2881.80.4.0.1.bb similarity index 96% rename from meta-networking/recipes-protocols/mdns/mdns_2881.0.25.bb rename to meta-networking/recipes-protocols/mdns/mdns_2881.80.4.0.1.bb index d44eb72f67..48bf3291b6 100644 --- a/meta-networking/recipes-protocols/mdns/mdns_2881.0.25.bb +++ b/meta-networking/recipes-protocols/mdns/mdns_2881.80.4.0.1.bb @@ -14,9 +14,10 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https file://0006-make-Add-top-level-Makefile.patch \ file://0001-Fix-build-with-gcc-15.patch \ file://mdns.service \ + file://0007-mDNSShared-Make-Apple-Wireless-Direct-Link-depend-on.patch \ " -BRANCH = "main" -SRCREV = "d4658af3f5f291311c6aee4210aa6d39bda82bbe" +BRANCH = "rel/mDNSResponder-2881" +SRCREV = "e2a1e56a2f8d29640908c48f4de3f1ba65d1af46" inherit github-releases manpages systemd update-rc.d