Merge remote-tracking branch 'upstream/3006.102' into master-3006

Changelog-3006.txt

@@ -3,6 +3,12 @@ Asuswrt-Merlin 3006.xxx Changelog
 
 3006.102.1_1-gnuton1 (xx-xxxx-2024)
   - NEW: Added support for GT-BE98.
+  - FIXED: DNSDirector and Tor pages would fail to properly load
+           in some environment.
+
+3006.102.xx (xx-xxx-xxxx)
+  - FIXED: DNSDirector and Tor pages would fail to properly load
+           in some environment.
 
 3006.102.1 (28-Jun-2024)
 

release/src/router/Makefile

@@ -1536,6 +1536,7 @@ ifeq ($(or $(RTCONFIG_TIMEMACHINE),$(RTCONFIG_MDNS)),y)
 obj-y += libdaemon
 obj-y += expat-2.0.1
 obj-y += avahi
+obj-y += libnss-mdns
 else
 ifeq ($(or $(RTCONFIG_MEDIA_SERVER),$(RTCONFIG_BWDPI)),y)
 obj-y += mDNSResponder
@@ -9427,6 +9428,25 @@ iproute2-5.11.0-clean:
 	-@$(MAKE) -C iproute2-5.11.0 clean
 	-rm -f iproute2-5.11.0/iproute2-5.11.0/Config
 
+libnss-mdns/configure:
+	cd libnss-mdns &&  autoreconf --force --install
+
+libnss-mdns/Makefile: libnss-mdns/configure
+	cd libnss-mdns && $(CONFIGURE) LDFLAGS="$(LDFLAGS) -L$(STAGEDIR)/usr/lib -ldl -lpthread $(EXTRA_LDFLAGS)" \
+		CFLAGS="$(CFLAGS) -I$(STAGEDIR)/usr/include -I$(TOP)/shared -I$(SRCBASE)/include" \
+		--prefix=/usr --sysconfdir=/tmp localstatedir=/var --with-distro=none \
+		--disable-tests --disable-static --enable-shared
+
+libnss-mdns: libnss-mdns/Makefile
+	@$(SEP)
+	@$(MAKE) -C libnss-mdns
+
+libnss-mdns-install: libnss-mdns
+	install -D libnss-mdns/.libs/libnss_mdns4_minimal.so.2 $(INSTALLDIR)/libnss-mdns/usr/lib/libnss_mdns4_minimal.so.2
+	install -D libnss-mdns/.libs/libnss_mdns4.so.2 $(INSTALLDIR)/libnss-mdns/usr/lib/libnss_mdns4.so.2
+	$(STRIP) $(INSTALLDIR)/libnss-mdns/usr/lib/libnss_mdns4_minimal.so.2
+	$(STRIP) $(INSTALLDIR)/libnss-mdns/usr/lib/libnss_mdns4.so.2
+
 # End merlin components
 
 readline-6.2/Makefile: readline-6.2/configure

release/src/router/libnss-mdns/.clang-format

@@ -0,0 +1,4 @@
+BasedOnStyle: LLVM
+IndentWidth: 4
+PointerAlignment: Left
+SortIncludes: false

release/src/router/libnss-mdns/.gitignore

@@ -0,0 +1,29 @@
+*~
+*.o
+*.la
+*.lo
+*.log
+*.tar.gz
+*.trs
+.deps
+.dirstamp
+.libs
+Makefile
+Makefile.in
+/aclocal.m4
+/ar-lib
+/autom4te.cache
+/avahi-test
+/compile
+/config.*
+/configure
+/check_util
+/depcomp
+/install-sh
+/libtool
+/ltmain.sh
+/m4
+/missing
+/nss-test
+/stamp-h1
+/test-driver

release/src/router/libnss-mdns/ACKNOWLEDGEMENTS.md

@@ -0,0 +1,9 @@
+- SHIROYAMA Takayuki, for patches
+- Anand Kumria, for patches
+- Bastien Nocera, for patches
+- Sjoerd Simons, for patches
+- Sean Meiners, for search list support
+- Philipp Zabel, for ARM support
+- Bruce M Simpson, for porting it to FreeBSD
+- Trent Lloyd, for migrating to GitHub
+- Google LLC, for patches

release/src/router/libnss-mdns/Makefile.am

@@ -0,0 +1,136 @@
+# This file is part of nss-mdns.
+#
+# nss-mdns is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# nss-mdns is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with nss-mdns; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+EXTRA_DIST=bootstrap.sh README.md ACKNOWLEDGEMENTS.md NEWS.md LICENSE
+ACLOCAL_AMFLAGS=-I m4
+
+# src
+EXTRA_DIST += src/map-file
+
+AM_CFLAGS = \
+	-DMDNS_ALLOW_FILE=\"$(MDNS_ALLOW_FILE)\" \
+	-DAVAHI_SOCKET=\"$(AVAHI_SOCKET)\"
+
+AM_LDFLAGS=-avoid-version -module -export-dynamic
+
+if FREEBSD_NSS
+lib_LTLIBRARIES = \
+	nss_mdns.la \
+	nss_mdns4.la \
+	nss_mdns6.la \
+	nss_mdns_minimal.la \
+	nss_mdns4_minimal.la \
+	nss_mdns6_minimal.la
+else
+lib_LTLIBRARIES = \
+	libnss_mdns.la \
+	libnss_mdns4.la \
+	libnss_mdns6.la \
+	libnss_mdns_minimal.la \
+	libnss_mdns4_minimal.la \
+	libnss_mdns6_minimal.la
+endif
+
+
+check_PROGRAMS = nss-test avahi-test
+
+libnss_mdns_la_SOURCES=src/util.c src/util.h src/avahi.c src/avahi.h src/nss.c src/nss.h
+libnss_mdns_la_CFLAGS=$(AM_CFLAGS)
+libnss_mdns_la_LDFLAGS=$(AM_LDFLAGS) -shrext .so.2 -Wl,-version-script=$(srcdir)/src/map-file
+
+libnss_mdns_minimal_la_SOURCES=$(libnss_mdns_la_SOURCES)
+libnss_mdns_minimal_la_CFLAGS=$(libnss_mdns_la_CFLAGS) -DMDNS_MINIMAL
+libnss_mdns_minimal_la_LDFLAGS=$(libnss_mdns_la_LDFLAGS)
+
+libnss_mdns4_la_SOURCES=$(libnss_mdns_la_SOURCES)
+libnss_mdns4_la_CFLAGS=$(libnss_mdns_la_CFLAGS) -DNSS_IPV4_ONLY=1
+libnss_mdns4_la_LDFLAGS=$(libnss_mdns_la_LDFLAGS)
+
+libnss_mdns4_minimal_la_SOURCES=$(libnss_mdns_la_SOURCES)
+libnss_mdns4_minimal_la_CFLAGS=$(libnss_mdns_la_CFLAGS) -DNSS_IPV4_ONLY=1 -DMDNS_MINIMAL
+libnss_mdns4_minimal_la_LDFLAGS=$(libnss_mdns_la_LDFLAGS)
+
+libnss_mdns6_la_SOURCES=$(libnss_mdns_la_SOURCES)
+libnss_mdns6_la_CFLAGS=$(libnss_mdns_la_CFLAGS) -DNSS_IPV6_ONLY=1
+libnss_mdns6_la_LDFLAGS=$(libnss_mdns_la_LDFLAGS)
+
+libnss_mdns6_minimal_la_SOURCES=$(libnss_mdns_la_SOURCES)
+libnss_mdns6_minimal_la_CFLAGS=$(libnss_mdns_la_CFLAGS) -DNSS_IPV6_ONLY=1 -DMDNS_MINIMAL
+libnss_mdns6_minimal_la_LDFLAGS=$(libnss_mdns_la_LDFLAGS)
+
+nss_mdns_la_SOURCES=$(libnss_mdns_la_SOURCES) src/bsdnss.c
+nss_mdns_la_CFLAGS=$(AM_CFLAGS)
+nss_mdns_la_LDFLAGS=$(AM_LDFLAGS) -shrext .so.1
+
+nss_mdns_minimal_la_SOURCES=$(nss_mdns_la_SOURCES)
+nss_mdns_minimal_la_CFLAGS=$(nss_mdns_la_CFLAGS) -DMDNS_MINIMAL
+nss_mdns_minimal_la_LDFLAGS=$(nss_mdns_la_LDFLAGS)
+
+nss_mdns4_la_SOURCES=$(nss_mdns_la_SOURCES)
+nss_mdns4_la_CFLAGS=$(nss_mdns_la_CFLAGS) -DNSS_IPV4_ONLY=1
+nss_mdns4_la_LDFLAGS=$(nss_mdns_la_LDFLAGS)
+
+nss_mdns4_minimal_la_SOURCES=$(nss_mdns_la_SOURCES)
+nss_mdns4_minimal_la_CFLAGS=$(nss_mdns_la_CFLAGS) -DNSS_IPV4_ONLY=1 -DMDNS_MINIMAL
+nss_mdns4_minimal_la_LDFLAGS=$(nss_mdns_la_LDFLAGS)
+
+nss_mdns6_la_SOURCES=$(nss_mdns_la_SOURCES)
+nss_mdns6_la_CFLAGS=$(nss_mdns_la_CFLAGS) -DNSS_IPV6_ONLY=1
+nss_mdns6_la_LDFLAGS=$(nss_mdns_la_LDFLAGS)
+
+nss_mdns6_minimal_la_SOURCES=$(nss_mdns_la_SOURCES)
+nss_mdns6_minimal_la_CFLAGS=$(nss_mdns_la_CFLAGS) -DNSS_IPV6_ONLY=1 -DMDNS_MINIMAL
+nss_mdns6_minimal_la_LDFLAGS=$(nss_mdns_la_LDFLAGS)
+
+avahi_test_SOURCES = \
+	src/avahi.c src/avahi.h \
+	src/util.c src/util.h \
+	src/avahi-test.c
+
+nss_test_SOURCES = \
+	src/nss-test.c
+
+install-exec-hook:
+	rm -f $(DESTDIR)$(libdir)/libnss_mdns.la
+	rm -f $(DESTDIR)$(libdir)/libnss_mdns_minimal.la
+	rm -f $(DESTDIR)$(libdir)/libnss_mdns4.la
+	rm -f $(DESTDIR)$(libdir)/libnss_mdns4_minimal.la
+	rm -f $(DESTDIR)$(libdir)/libnss_mdns6.la
+	rm -f $(DESTDIR)$(libdir)/libnss_mdns6_minimal.la
+	rm -f $(DESTDIR)$(libdir)/nss_mdns.la
+	rm -f $(DESTDIR)$(libdir)/nss_mdns_minimal.la
+
+uninstall-hook:
+	rm -f $(DESTDIR)$(libdir)/libnss_mdns.so.2
+	rm -f $(DESTDIR)$(libdir)/libnss_mdns_minimal.so.2
+	rm -f $(DESTDIR)$(libdir)/libnss_mdns4.so.2
+	rm -f $(DESTDIR)$(libdir)/libnss_mdns4_minimal.so.2
+	rm -f $(DESTDIR)$(libdir)/libnss_mdns6.so.2
+	rm -f $(DESTDIR)$(libdir)/libnss_mdns6_minimal.so.2
+	rm -f $(DESTDIR)$(libdir)/nss_mdns.so.2
+	rm -f $(DESTDIR)$(libdir)/nss_mdns_minimal.so.2
+
+
+# tests
+if ENABLE_TESTS
+TESTS = check_util
+check_PROGRAMS += check_util
+check_util_SOURCES = tests/check_util.c src/util.h
+check_util_CFLAGS = @CHECK_CFLAGS@
+check_util_LDADD = src/util.o @CHECK_LIBS@
+endif
+
+EXTRA_DIST += tests/check_util.c