From fb93cd27955f1ab6a35df6063697b878d8954268 Mon Sep 17 00:00:00 2001
From: Beginner <70857188+Beginner-Go@users.noreply.github.com>
Date: Sun, 2 May 2021 22:42:16 +0800
Subject: [PATCH 1/2] feeds.conf.default: remove management feed (#6763)

---
 feeds.conf.default | 1 -
 1 file changed, 1 deletion(-)

diff --git a/feeds.conf.default b/feeds.conf.default
index fc1424dea..276b2be4a 100644
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -4,7 +4,6 @@ src-git routing https://git.openwrt.org/feed/routing.git
 src-git telephony https://git.openwrt.org/feed/telephony.git
 #src-git video https://github.com/openwrt/video.git
 #src-git targets https://github.com/openwrt/targets.git
-#src-git management https://github.com/openwrt-management/packages.git
 #src-git oldpackages http://git.openwrt.org/packages.git
 #src-link custom /usr/src/openwrt/custom-feed
 #src-git helloworld https://github.com/fw876/helloworld

From d3d6f3a2c46268ea652c5a7087047e6b592be4cb Mon Sep 17 00:00:00 2001
From: z826540272 <56025847+z826540272@users.noreply.github.com>
Date: Mon, 3 May 2021 22:50:02 +0800
Subject: [PATCH 2/2] DNSMASQ ttl config (#6779)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

默认情况下 SSR PLUS DNS结果根本无法缓存(由于引入拒绝ipv6结果导致的问题)，nslookup & dig 延迟每次依然有200-300多.
dnsmasq处设置缓存依然无效，设置TTL也无效，应该是bug。
解决办法是手动指定缓存TTL为最大一小时。域名查询实测有效缓存0延迟。

此变更仅使开启dnsmasq缓存的情况下正常工作。
---
 package/network/services/dnsmasq/files/dnsmasq.conf | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/network/services/dnsmasq/files/dnsmasq.conf b/package/network/services/dnsmasq/files/dnsmasq.conf
index bf5816be5..69f60d170 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.conf
+++ b/package/network/services/dnsmasq/files/dnsmasq.conf
@@ -35,3 +35,8 @@
 # "bert" another name, bertrand
 # The fields are <cname>,<target>
 #cname=bertand,bert
+
+neg-ttl=600
+# max-ttl=600
+min-cache-ttl=3600
+auth-ttl=3600