update

devices/common/diy/package/network/services/dnsmasq/patches/900-filter-aaaa.patch

@@ -1,36 +0,0 @@
---- a/src/dnsmasq.h
-+++ b/src/dnsmasq.h
-@@ -271,3 +271,4 @@
- #define OPT_LEASE_RENEW    61
--#define OPT_LAST           62
-+#define OPT_FILTER_AAAA    62
-+#define OPT_LAST           63
- 
-
---- a/src/option.c
-+++ b/src/option.c
-@@ -169,2 +169,3 @@
- #define LOPT_SCRIPT_TIME   360
-+#define LOPT_FILTER_AAAA   361
-  
-@@ -341,2 +342,3 @@
-     { "dhcp-ignore-clid", 0, 0,  LOPT_IGNORE_CLID },
-+    { "filter-aaaa", 0, 0, LOPT_FILTER_AAAA },
-     { NULL, 0, 0, 0 }
-@@ -520,2 +522,3 @@
-   { LOPT_SCRIPT_TIME, OPT_LEASE_RENEW, NULL, gettext_noop("Call dhcp-script when lease expiry changes."), NULL },
-+  { LOPT_FILTER_AAAA, OPT_FILTER_AAAA, NULL, gettext_noop("Filter all AAAA requests."), NULL },
-   { 0, 0, NULL, NULL, NULL }
-
---- a/src/rfc1035.c
-+++ b/src/rfc1035.c
-@@ -1957,2 +1957,9 @@
- 
-+      if (qtype == T_AAAA && option_bool(OPT_FILTER_AAAA) ){
-+        //return a null reply
-+        ans = 1;
-+        if (!dryrun) log_query(F_CONFIG | F_IPV6 | F_NEG, name, &addr, NULL);
-+        break;
-+      }
-+
-       if (!ans)

devices/common/patches/AdGuardHome.patch

@@ -1,11 +0,0 @@
---- a/package/feeds/custom/luci-app-adguardhome/root/etc/init.d/AdGuardHome
-+++ b/package/feeds/custom/luci-app-adguardhome/root/etc/init.d/AdGuardHome
-@@ -28,7 +28,7 @@ set_forward_dnsmasq()
- 		if [ "$server" = "$addr" ]; then
- 			continue
- 		fi
--		uci add_list dhcp.@dnsmasq[0].server=$server
-+		# uci add_list dhcp.@dnsmasq[0].server=$server
- 	done
- 	uci delete dhcp.@dnsmasq[0].resolvfile 2>/dev/null
- 	uci set dhcp.@dnsmasq[0].noresolv=1

devices/common/patches/conffiles.patch

@@ -1,227 +0,0 @@
---- a/package/feeds/custom/luci-app-openclash/Makefile
-+++ b/package/feeds/custom/luci-app-openclash/Makefile
-@@ -51,2 +51,3 @@
- define Package/$(PKG_NAME)/conffiles
-+/etc/config/openclash
- endef
-@@ -91,2 +92,3 @@
- define Package/$(PKG_NAME)/install
-+	$(INSTALL_DIR) $(1)/usr/lib/lua/luci
- 	$(CP) $(PKG_BUILD_DIR)/root/* $(1)/
-
---- a/package/feeds/custom/luci-app-unblockmusic/Makefile
-+++ b/package/feeds/custom/luci-app-unblockmusic/Makefile
-@@ -28,6 +28,10 @@ LUCI_PKGARCH:=all
- 
- PKG_MAINTAINER:=lean
- 
-+define Package/luci-app-unblockmusic/conffiles
-+/etc/config/unblockmusic
-+endef
-+
- include $(TOPDIR)/feeds/luci/luci.mk
- 
- # call BuildPackage - OpenWrt buildroot signature
-
---- a/package/feeds/custom/luci-app-qbittorrent/Makefile
-+++ b/package/feeds/custom/luci-app-qbittorrent/Makefile
-@@ -14,4 +14,8 @@ PKG_NAME:=luci-app-qbittorrent
- 
-+define Package/luci-app-qbittorrent/conffiles
-+/etc/config/qbittorrent
-+endef
-+
- include $(TOPDIR)/feeds/luci/luci.mk
- 
- # call BuildPackage - OpenWrt buildroot signature
-
---- a/package/feeds/custom/luci-app-kodexplorer/Makefile
-+++ b/package/feeds/custom/luci-app-kodexplorer/Makefile
-@@ -13,4 +13,8 @@ LUCI_PKGARCH:=all
- 
-+define Package/luci-app-kodexplorer/conffiles
-+/etc/config/kodexplorer
-+endef
-+
- include $(TOPDIR)/feeds/luci/luci.mk
- 
- # call BuildPackage - OpenWrt buildroot signature
-
---- a/package/feeds/custom/luci-app-zerotier/Makefile
-+++ b/package/feeds/custom/luci-app-zerotier/Makefile
-@@ -14,4 +14,8 @@ LUCI_PKGARCH:=all
- 
-+define Package/luci-app-zerotier/conffiles
-+/etc/config/zerotier
-+endef
-+
- include $(TOPDIR)/feeds/luci/luci.mk
- 
- # call BuildPackage - OpenWrt buildroot signature
-
---- a/package/feeds/custom/luci-app-turboacc/Makefile
-+++ b/package/feeds/custom/luci-app-turboacc/Makefile
-@@ -44,6 +44,10 @@ PKG_CONFIG_DEPENDS:= \
- 	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_bbr-cca \
- 	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_dnsforwarder
- 
-+define Package/luci-app-turboacc/conffiles
-+/etc/config/turboacc
-+endef
-+
- include $(TOPDIR)/feeds/luci/luci.mk
- 
- # call BuildPackage - OpenWrt buildroot signature
-
---- a/package/feeds/custom/luci-app-adbyby-plus/Makefile
-+++ b/package/feeds/custom/luci-app-adbyby-plus/Makefile
-@@ -14,4 +14,8 @@ PKG_NAME:=luci-app-adbyby-plus
- 
-+define Package/luci-app-adbyby-plus/conffiles
-+/etc/config/adbyby
-+endef
-+
- include $(TOPDIR)/feeds/luci/luci.mk
- 
- # call BuildPackage - OpenWrt buildroot signature
-
---- a/package/feeds/custom/luci-app-autoreboot/Makefile
-+++ b/package/feeds/custom/luci-app-autoreboot/Makefile
-@@ -13,4 +13,8 @@ LUCI_PKGARCH:=all
- 
-+define Package/luci-app-autoreboot/conffiles
-+/etc/config/autoreboot
-+endef
-+
- include $(TOPDIR)/feeds/luci/luci.mk
- 
- # call BuildPackage - OpenWrt buildroot signature
-
---- a/package/feeds/custom/luci-app-usb-printer/Makefile
-+++ b/package/feeds/custom/luci-app-usb-printer/Makefile
-@@ -13,4 +13,8 @@ LUCI_DEPENDS:=+p910nd +kmod-usb-printer
- 
-+define Package/luci-app-usb-printer/conffiles
-+/etc/config/usb_printer
-+endef
-+
- include $(TOPDIR)/feeds/luci/luci.mk
- 
- # call BuildPackage - OpenWrt buildroot signature
-
---- a/package/feeds/custom/luci-app-vlmcsd/Makefile
-+++ b/package/feeds/custom/luci-app-vlmcsd/Makefile
-@@ -13,4 +13,8 @@ LUCI_DEPENDS:=+vlmcsd
- 
-+define Package/luci-app-vlmcsd/conffiles
-+/etc/config/vlmcsd
-+endef
-+
- include $(TOPDIR)/feeds/luci/luci.mk
- 
- # call BuildPackage - OpenWrt buildroot signature
-
---- a/package/feeds/custom/luci-app-softethervpn/Makefile
-+++ b/package/feeds/custom/luci-app-softethervpn/Makefile
-@@ -13,4 +13,8 @@ LUCI_PKGARCH:=all
- 
-+define Package/luci-app-softethervpn/conffiles
-+/etc/config/softethervpn
-+endef
-+
- include $(TOPDIR)/feeds/luci/luci.mk
- 
- # call BuildPackage - OpenWrt buildroot signature
-
---- a/package/feeds/custom/luci-app-xlnetacc/Makefile
-+++ b/package/feeds/custom/luci-app-xlnetacc/Makefile
-@@ -11,6 +11,10 @@ LUCI_DEPENDS:=+jshn +wget +openssl-util
- LUCI_PKGARCH:=all
- LUCI_DESCRIPTION=LuCI Support for XLNetAcc.
- 
-+define Package/luci-app-xlnetacc/conffiles
-+/etc/config/xlnetacc
-+endef
-+
- include $(TOPDIR)/feeds/luci/luci.mk
- 
- # call BuildPackage - OpenWrt buildroot signature
-
---- a/package/feeds/custom/luci-app-accesscontrol/Makefile
-+++ b/package/feeds/custom/luci-app-accesscontrol/Makefile
-@@ -15,4 +15,8 @@ PKG_NAME:=luci-app-accesscontrol
- 
-+define Package/luci-app-accesscontrol/conffiles
-+/etc/config/mia
-+endef
-+
- include $(TOPDIR)/feeds/luci/luci.mk
- 
- # call BuildPackage - OpenWrt buildroot signature
-
---- a/package/feeds/custom/vsftpd-alt/Makefile
-+++ b/package/feeds/custom/vsftpd-alt/Makefile
-@@ -33,7 +33,7 @@ define Package/vsftpd-alt/Default
- endef
- 
- define Package/vsftpd-alt/conffiles
--/etc/vsftpd.conf
-+/etc/config/vsftpd
- endef
- 
- #EXTRA_LDFLAGS:= -lcrypt -lcrypto -lssl
-
---- a/package/feeds/custom/open-app-filter/Makefile
-+++ b/package/feeds/custom/open-app-filter/Makefile
-@@ -29,6 +29,9 @@ define Package/appfilter/description
-   open appfilter app
- endef
- 
-+define Package/$(PKG_NAME)/conffiles
-+  /etc/config/appfilter
-+endef
- 
- define Package/appfilter/install
- 	echo "install"
-
---- a/package/feeds/custom/luci-app-nfs/Makefile
-+++ b/package/feeds/custom/luci-app-nfs/Makefile
-@@ -11,6 +11,10 @@ LUCI_PKGARCH:=all
- PKG_VERSION:=1.1
- PKG_RELEASE:=1
- 
-+define Package/luci-app-nfs/conffiles
-+/etc/config/nfs
-+endef
-+
- include $(TOPDIR)/feeds/luci/luci.mk
- 
- # call BuildPackage - OpenWrt buildroot signature
-
---- a/package/feeds/custom/gowebdav/Makefile
-+++ b/package/feeds/custom/gowebdav/Makefile
-@@ -36,6 +36,10 @@ define Package/$(PKG_NAME)/description
- 	A simple WebDav server written in Golang.
- endef
- 
-+define Package/$(PKG_NAME)/conffiles
-+/etc/config/gowebdav
-+endef
-+
- define Build/Prepare
- 	tar -zxf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR) --strip-components 1
- endef
-
---- a/package/feeds/custom/luci-app-frpc/Makefile
-+++ b/package/feeds/custom/luci-app-frpc/Makefile
-@@ -12,6 +12,10 @@ LUCI_PKGARCH:=all
- PKG_VERSION:=1.2
- PKG_RELEASE:=1
- 
-+define Package/luci-app-frpc/conffiles
-+/etc/config/frp
-+endef
-+
- include $(TOPDIR)/feeds/luci/luci.mk
- 
- # call BuildPackage - OpenWrt buildroot signature

devices/common/patches/passwall.patch

@@ -1,58 +0,0 @@
---- a/package/feeds/custom/luci-app-passwall/luasrc/controller/passwall.lua
-+++ b/package/feeds/custom/luci-app-passwall/luasrc/controller/passwall.lua
-@@ -36,9 +36,11 @@ function index()
- 	entry({"admin", "services", appname, "acl"}, cbi(appname .. "/client/acl"), _("Access control"), 98).leaf = true
- 	entry({"admin", "services", appname, "log"}, form(appname .. "/client/log"), _("Watch Logs"), 999).leaf = true
- 
-+	if nixio.fs.access("/usr/bin/ssr-server") then
- 	--[[ Server ]]
- 	entry({"admin", "services", appname, "server"}, cbi(appname .. "/server/index"), _("Server-Side"), 99).leaf = true
- 	entry({"admin", "services", appname, "server_user"}, cbi(appname .. "/server/user")).leaf = true
-+	end
- 
- 	--[[ API ]]
- 	entry({"admin", "services", appname, "server_user_status"}, call("server_user_status")).leaf = true
-
---- a/package/feeds/custom/luci-app-passwall/luasrc/model/cbi/passwall/client/auto_switch.lua
-+++ b/package/feeds/custom/luci-app-passwall/luasrc/model/cbi/passwall/client/auto_switch.lua
-@@ -37,11 +37,6 @@ o.default = "3"
- -- 暂时只支持TCP1
- local tcp_node_num = 1
- for i = 1, tcp_node_num, 1 do
--    o = s:option(ListValue, "tcp_main" .. i, "TCP " .. i .. " " .. translate("Main node"))
--    for k, v in pairs(nodes_table) do
--        o:value(v.id, v.remarks)
--    end
--    
-     o = s:option(DynamicList, "tcp_node" .. i, "TCP " .. i .. " " .. translate("List of backup nodes"))
-     for k, v in pairs(nodes_table) do
-         o:value(v.id, v.remarks)
-
---- a/package/feeds/custom/luci-app-passwall/luasrc/view/passwall/rule/rule_version.htm
-+++ b/package/feeds/custom/luci-app-passwall/luasrc/view/passwall/rule/rule_version.htm
-@@ -26,13 +26,9 @@
- 				update: checkBoxList
- 			},
- 			function(x, data) {
--				if(x && x.status == 200) {
--					window.location.href = '<%=url([[admin]], [[services]], [[passwall]], [[log]])%>';
--				} else {
- 					alert("<%:Error%>");
- 					btn.disabled = false;
- 					btn.value = '<%:Manually update%>';
--				}
- 			}
- 		);
- 	}
-
---- a/package/feeds/custom/luci-app-passwall/root/usr/share/passwall/app.sh
-+++ b/package/feeds/custom/luci-app-passwall/root/usr/share/passwall/app.sh
-@@ -933,8 +933,6 @@ add_dnsmasq() {
- 		msg="ISP"
- 		servers="${LOCAL_DNS}"
- 		echo "conf-dir=${TMP_DNSMASQ_PATH}" > "/var/dnsmasq.d/dnsmasq-${CONFIG}.conf"
--		#兼容旧版dnsmasq
--		echo "conf-dir=${TMP_DNSMASQ_PATH}" > "${DNSMASQ_PATH}/dnsmasq-${CONFIG}.conf"
- 
- 		[ "${USE_CHNLIST}" = "1" ] && [ -z "${returnhome}" ] && [ -n "${chnlist}" ] && servers="${TUN_DNS}"
- 		[ -n "${chnlist}" ] && msg="中国列表以外"

devices/common/patches/ss.patch

@@ -1,83 +0,0 @@
---- a/package/feeds/custom/shadowsocks-libev/Makefile
-+++ b/package/feeds/custom/shadowsocks-libev/Makefile
-@@ -33,27 +33,6 @@ PKG_BUILD_DEPENDS:=c-ares pcre
- 
- include $(INCLUDE_DIR)/package.mk
- 
--
--define Package/shadowsocks-libev-config
--  SECTION:=net
--  CATEGORY:=Network
--  SUBMENU:=Web Servers/Proxies
--  TITLE:=shadowsocks-libev config scripts
--  URL:=https://github.com/shadowsocks/shadowsocks-libev
--endef
--
--define Package/shadowsocks-libev-config/conffiles
--/etc/config/shadowsocks-libev
--endef
--
--define Package/shadowsocks-libev-config/install
--	$(INSTALL_DIR) $(1)/etc/config
--	$(INSTALL_DATA) ./files/shadowsocks-libev.config $(1)/etc/config/shadowsocks-libev
--	$(INSTALL_DIR) $(1)/etc/init.d
--	$(INSTALL_BIN) ./files/shadowsocks-libev.init $(1)/etc/init.d/shadowsocks-libev
--endef
--
--
- define Package/shadowsocks-libev/Default
-   define Package/shadowsocks-libev-$(1)
-     SECTION:=net
-@@ -61,7 +40,7 @@ define Package/shadowsocks-libev/Default
-     SUBMENU:=Web Servers/Proxies
-     TITLE:=shadowsocks-libev $(1)
-     URL:=https://github.com/shadowsocks/shadowsocks-libev
--    DEPENDS:=+libev +libmbedtls +libpthread +libsodium +shadowsocks-libev-config $(DEPENDS_$(1))
-+    DEPENDS:=+libev +libmbedtls +libpthread +libsodium $(DEPENDS_$(1))
-   endef
- 
-   define Package/shadowsocks-libev-$(1)/install
-@@ -82,34 +61,6 @@ define shadowsocks-libev/templates
- endef
- $(eval $(call shadowsocks-libev/templates))
- 
--
--define Package/shadowsocks-libev-ss-rules
--  SECTION:=net
--  CATEGORY:=Network
--  SUBMENU:=Web Servers/Proxies
--  TITLE:=shadowsocks-libev ss-rules
--  URL:=https://github.com/shadowsocks/shadowsocks-libev
--  DEPENDS:=+ip +ipset +iptables-mod-tproxy +resolveip +shadowsocks-libev-ss-redir +shadowsocks-libev-config
--endef
--
--define Package/shadowsocks-libev-ss-rules/install
--	$(INSTALL_DIR) $(1)/usr/bin
--	$(INSTALL_BIN) ./files/ss-rules $(1)/usr/bin
--	$(INSTALL_DIR) $(1)/etc/uci-defaults
--	$(INSTALL_DATA) ./files/firewall.ss-rules $(1)/etc
--	$(INSTALL_BIN) ./files/ss-rules.defaults $(1)/etc/uci-defaults
--endef
--
--define Package/shadowsocks-libev-ss-rules/prerm
--#!/bin/sh
--s=firewall.ss_rules
--uci get "$$s" >/dev/null || exit 0
--uci batch <<-EOF
--	delete $$s
--	commit firewall
--EOF
--endef
--
- define Build/Prepare
- 	$(call Build/Prepare/Default)
- 	$(FIND) $(PKG_BUILD_DIR) \
-@@ -129,8 +80,6 @@ CONFIGURE_ARGS += \
- TARGET_CFLAGS += -flto
- TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
- 
--$(eval $(call BuildPackage,shadowsocks-libev-config))
--$(eval $(call BuildPackage,shadowsocks-libev-ss-rules))
- $(foreach component,$(SHADOWSOCKS_COMPONENTS), \
-   $(eval $(call BuildPackage,shadowsocks-libev-$(component))) \
- )

devices/common/patches/turboacc.patch

@@ -1,140 +0,0 @@
---- a/package/feeds/custom/luci-app-turboacc/root/etc/init.d/turboacc
-+++ b/package/feeds/custom/luci-app-turboacc/root/etc/init.d/turboacc
-@@ -232,27 +232,6 @@ start(){
- 		sysctl -w net.ipv4.tcp_congestion_control="bbr"
- 	else
- 		sysctl -w net.ipv4.tcp_congestion_control="cubic"
--	fi	
--
--	[ "${dns_acc}" -eq "1" ] && {
--	mkdir -p "/tmp/dnsmasq.d"
--	wget-ssl -q -t "20" -T "5" "https://cdn.jsdelivr.net/gh/googlehosts/hosts@master/hosts-files/dnsmasq.conf" -O "/tmp/dnsmasq.d/dnsmasq-googlehosts.conf" &
--}
--
--	if [ "${dns_caching}" -eq "1" ];  then
--		stop_dnscache
--		sleep 1
--		rm -f "/var/log/dnscache.file"
--		if [ "${dns_caching_mode}" = "1" ];  then
--			start_pdnsd
--		elif [ "${dns_caching_mode}" = "2" ];  then
--			start_dnsforwarder
--		fi
--		change_dns
--		nohup "/usr/share/dnscache/dnscache-while.sh" > "/var/log/dnscache.file" 2>&1 &
--	else
--		stop_dnscache
--		revert_dns
- 	fi
- 
- 	if [ "${restart_utils}" = "true" ]; then
-@@ -275,11 +254,6 @@ stop(){
- 		rmmod "fast_classifier" 2>"/dev/null"
- }
- 
--	[ "${dns_acc}" -eq "0" ] && rm -f "/tmp/dnsmasq.d/dnsmasq-googlehosts.conf"
--
--	stop_dnscache
--	revert_dns
--
- 	if [ "${restart_utils}" = "true" ]; then
- 		/etc/init.d/dnsmasq restart >/dev/null 2>&1 && echo "DNSMASQ revert"
- 		/etc/init.d/firewall restart >/dev/null 2>&1
-
---- a/package/feeds/custom/luci-app-turboacc/luasrc/model/cbi/turboacc.lua
-+++ b/package/feeds/custom/luci-app-turboacc/luasrc/model/cbi/turboacc.lua
-@@ -59,33 +59,4 @@ fullcone_nat.rmempty = false
- fullcone_nat.description = translate("Using FullCone NAT can improve gaming performance effectively")
- end 
- 
--dns_acc = s:option(Flag, "dns_acc", translate("DNS Acceleration"))
--dns_acc.default = 0
--dns_acc.rmempty = false
--dns_acc.description = translate("Using optimized DNS records for GoogleHosts (Don't use under Clash Fake-IP mode)")
--
--dns_caching = s:option(Flag, "dns_caching", translate("DNS Caching"))
--dns_caching.default = 0
--dns_caching.rmempty = false
--dns_caching.description = translate("Enable DNS Caching and anti ISP DNS pollution")
--
--dns_caching_mode = s:option(ListValue, "dns_caching_mode", translate("Resolve DNS Mode"), translate("Only PDNSD and DNSForwarder is supported now"))
--dns_caching_mode:value("1", translate("Using PDNSD to query and cache"))
--if nixio.fs.access("/usr/bin/dnsforwarder") then
--dns_caching_mode:value("2", translate("Using DNSForwarder to query and cache"))
--end
--dns_caching_mode.default = 1
--dns_caching_mode:depends("dns_caching", 1)
--
--dns_caching_v4_dns = s:option(Value, "dns_caching_v4_dns", translate("Upsteam IPv4 DNS Server"))
--dns_caching_v4_dns.default = "114.114.114.114,114.114.115.115,223.5.5.5,223.6.6.6,180.76.76.76,119.29.29.29,119.28.28.28,1.2.4.8,210.2.4.8"
--dns_caching_v4_dns.description = translate("Muitiple IPv4 DNS server can saperate with ','")
--dns_caching_v4_dns:depends("dns_caching_mode", 1)
--dns_caching_v4_dns:depends("dns_caching_mode", 2)
--
--dns_caching_v6_dns = s:option(Value, "dns_caching_v6_dns", translate("Upsteam IPv6 DNS Server"))
--dns_caching_v6_dns.default = "2001:4860:4860::8888,2001:4860:4860::8844,2001:2001::1111,2001:2001::1001,2400:da00::6666,240C::6666,240C::6644"
--dns_caching_v6_dns.description = translate("Muitiple IPv6 DNS server can saperate with ','")
--dns_caching_v6_dns:depends("dns_caching_mode", 2)
--
- return m
-
---- a/package/feeds/custom/luci-app-turboacc/Makefile
-+++ b/package/feeds/custom/luci-app-turboacc/Makefile
-@@ -12,11 +12,9 @@ PKG_RELEASE:=1
- PKG_LICENSE:=GPLv3.0+
- 
- LUCI_TITLE:=LuCI support for Flow Offload / Shortcut-FE
--LUCI_DEPENDS:=+pdnsd-alt \
--              +PACKAGE_$(PKG_NAME)_INCLUDE_shortcut-fe:kmod-fast-classifier \
-+LUCI_DEPENDS:=+PACKAGE_$(PKG_NAME)_INCLUDE_shortcut-fe:kmod-fast-classifier \
-               +PACKAGE_$(PKG_NAME)_INCLUDE_flow-offload:kmod-ipt-offload \
--              +PACKAGE_$(PKG_NAME)_INCLUDE_bbr-cca:kmod-tcp-bbr \
--              +PACKAGE_$(PKG_NAME)_INCLUDE_dnsforwarder:dnsforwarder
-+              +PACKAGE_$(PKG_NAME)_INCLUDE_bbr-cca:kmod-tcp-bbr
- LUCI_PKGARCH:=all
- 
- define Package/$(PKG_NAME)/config
-@@ -32,17 +30,12 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_shortcut-fe
- config PACKAGE_$(PKG_NAME)_INCLUDE_bbr-cca
- 	bool "Include BBR CCA"
- 	default y
--
--config PACKAGE_$(PKG_NAME)_INCLUDE_dnsforwarder
--	bool "Include DNSForwarder"
--	default n
- endef
- 
- PKG_CONFIG_DEPENDS:= \
- 	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_shortcut-fe \
- 	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_flow-offload \
--	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_bbr-cca \
--	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_dnsforwarder
-+	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_bbr-cca
- 
- include $(TOPDIR)/feeds/luci/luci.mk
- 
-
---- a/package/feeds/custom/luci-app-turboacc/luasrc/view/turboacc/status.htm
-+++ b/package/feeds/custom/luci-app-turboacc/luasrc/view/turboacc/status.htm
-@@ -4,7 +4,6 @@
- 		<tr><td width="33%"><%:Flow Offloading%></td><td id="_fastpath_state"><em><%:Collecting data...%></em></td></tr>
- 		<tr><td width="33%"><%:BBR CCA%></td><td id="_bbr_state"><em><%:Collecting data...%></em></td></tr>
- 		<tr><td width="33%"><%:FullCone NAT%></td><td id="_fullconenat_state"><em><%:Collecting data...%></em></td></tr>
--		<tr><td width="33%"><%:DNS Caching%></td><td id="_dnscaching_state"><em><%:Collecting data...%></em></td></tr>
- 	</table>
- </fieldset>
- 
-@@ -12,13 +11,11 @@
- 	var fastpath_state = document.getElementById('_fastpath_state');
- 	var bbr_state = document.getElementById('_bbr_state');
- 	var fullconenat_state = document.getElementById('_fullconenat_state');
--	var dnscaching_state = document.getElementById('_dnscaching_state');
- 	XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "turboacc", "status")%>', null, function(x, status) {
- 		if ( x && x.status == 200 ) {
- 			fastpath_state.innerHTML = status.fastpath_state ? '<em><b><font color=green><%:RUNNING%></font></b></em>' : '<em><b><font color=red><%:NOT RUNNING%></font></b></em>';
- 			bbr_state.innerHTML = status.bbr_state ? '<em><b><font color=green><%:RUNNING%></font></b></em>' : '<em><b><font color=red><%:NOT RUNNING%></font></b></em>';
- 			fullconenat_state.innerHTML = status.fullconenat_state ? '<em><b><font color=green><%:RUNNING%></font></b></em>' : '<em><b><font color=red><%:NOT RUNNING%></font></b></em>';
--			dnscaching_state.innerHTML = status.dnscaching_state ? '<em><b><font color=green><%:RUNNING%></font></b></em>' : '<em><b><font color=red><%:NOT RUNNING%></font></b></em>';
- 		}
- 	});
- //]]>