From 1e4d58b9857d8a3114f30543b2408bf0051aaf74 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 21 Jun 2023 12:04:33 +0200 Subject: [PATCH] [mdns] update mDNSResponder to 1790.80.10 --- script/bootstrap | 11 +++++------ tests/scripts/bootstrap.sh | 9 ++++----- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/script/bootstrap b/script/bootstrap index 0b72aa49715..2256f5e437f 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -56,16 +56,15 @@ install_packages_apt() # mDNS sudo apt-get install --no-install-recommends -y libavahi-client3 libavahi-common-dev libavahi-client-dev avahi-daemon - (MDNS_RESPONDER_SOURCE_NAME=mDNSResponder-1310.80.1 \ + (MDNS_RESPONDER_SOURCE_NAME=mDNSResponder-1790.80.10 \ && cd /tmp \ && wget --no-check-certificate https://github.com/apple-oss-distributions/mDNSResponder/archive/refs/tags/$MDNS_RESPONDER_SOURCE_NAME.tar.gz \ && mkdir -p $MDNS_RESPONDER_SOURCE_NAME \ && tar xvf $MDNS_RESPONDER_SOURCE_NAME.tar.gz -C $MDNS_RESPONDER_SOURCE_NAME --strip-components=1 \ - && cd /tmp/$MDNS_RESPONDER_SOURCE_NAME/Clients \ - && sed -i '/#include /a #include ' dns-sd.c \ - && sed -i '/#include /a #include ' dns-sd.c \ - && cd /tmp/$MDNS_RESPONDER_SOURCE_NAME/mDNSPosix \ - && make os=linux && sudo make install os=linux) + && cd /tmp/"$MDNS_RESPONDER_SOURCE_NAME"/mDNSShared \ + && sed -i 's/__block mStatus err;/mStatus err;/' uds_daemon.c \ + && cd /tmp/"$MDNS_RESPONDER_SOURCE_NAME"/mDNSPosix \ + && make os=linux tls=no && sudo make install os=linux tls=no) # Boost sudo apt-get install --no-install-recommends -y libboost-dev libboost-filesystem-dev libboost-system-dev diff --git a/tests/scripts/bootstrap.sh b/tests/scripts/bootstrap.sh index a89e9ccd6ef..6b4affffce6 100755 --- a/tests/scripts/bootstrap.sh +++ b/tests/scripts/bootstrap.sh @@ -126,15 +126,14 @@ case "$(uname)" in fi if [ "${OTBR_MDNS-}" == 'mDNSResponder' ]; then - SOURCE_NAME=mDNSResponder-1310.80.1 + SOURCE_NAME=mDNSResponder-1790.80.10 wget https://github.com/apple-oss-distributions/mDNSResponder/archive/refs/tags/$SOURCE_NAME.tar.gz \ && mkdir -p $SOURCE_NAME \ && tar xvf $SOURCE_NAME.tar.gz -C $SOURCE_NAME --strip-components=1 \ - && cd $SOURCE_NAME/Clients \ - && sed -i '/#include /a #include ' dns-sd.c \ - && sed -i '/#include /a #include ' dns-sd.c \ + && cd "$SOURCE_NAME"/mDNSShared \ + && sed -i 's/__block mStatus err;/mStatus err;/' uds_daemon.c \ && cd ../mDNSPosix \ - && make os=linux && sudo make install os=linux + && make os=linux tls=no && sudo make install os=linux tls=no fi # Enable IPv6