From 1e93ef84981f2722138824413a1b197fdab7fb6c Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Sat, 28 Jul 2018 10:47:32 +0100 Subject: dnsmasq: bump to dnsmasq v2.80test3 Refresh patches Upstream commits since last bump: 3b6eb19 Log DNSSEC trust anchors at startup. f3e5787 Trivial comment change. c851c69 Log failure to confirm an address in DHCPv6. a3bd7e7 Fix missing fatal errors when parsing some command-line/config options. ab5ceaf Document the --help option in the french manual 1f2f69d Fix recurrent minor spelling mistake in french manual f361b39 Fix some mistakes in french translation of the manual eb1fe15 When replacing cache entries, preserve CNAMES which target them. Signed-off-by: Kevin Darbyshire-Bryant --- ...-on-very-large-cachesize-config-instead-o.patch | 38 ---------------------- 1 file changed, 38 deletions(-) delete mode 100644 package/network/services/dnsmasq/patches/0010-Log-warning-on-very-large-cachesize-config-instead-o.patch (limited to 'package/network/services/dnsmasq/patches/0010-Log-warning-on-very-large-cachesize-config-instead-o.patch') diff --git a/package/network/services/dnsmasq/patches/0010-Log-warning-on-very-large-cachesize-config-instead-o.patch b/package/network/services/dnsmasq/patches/0010-Log-warning-on-very-large-cachesize-config-instead-o.patch deleted file mode 100644 index 177b2dcc01..0000000000 --- a/package/network/services/dnsmasq/patches/0010-Log-warning-on-very-large-cachesize-config-instead-o.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1f1873aadd092a0fab505dd278a484d887ba0ec3 Mon Sep 17 00:00:00 2001 -From: Simon Kelley -Date: Fri, 11 May 2018 23:38:23 +0100 -Subject: [PATCH 10/17] Log warning on very large cachesize config, instead of - truncating it. - -Signed-off-by: Kevin Darbyshire-Bryant ---- - src/dnsmasq.c | 6 +++++- - src/option.c | 2 -- - 2 files changed, 5 insertions(+), 3 deletions(-) - ---- a/src/dnsmasq.c -+++ b/src/dnsmasq.c -@@ -740,7 +740,11 @@ int main (int argc, char **argv) - else - { - if (daemon->cachesize != 0) -- my_syslog(LOG_INFO, _("started, version %s cachesize %d"), VERSION, daemon->cachesize); -+ { -+ my_syslog(LOG_INFO, _("started, version %s cachesize %d"), VERSION, daemon->cachesize); -+ if (daemon->cachesize > 10000) -+ my_syslog(LOG_WARNING, _("cache size greater than 10000 may cause performance issues, and is unlikely to be useful.")); -+ } - else - my_syslog(LOG_INFO, _("started, version %s cache disabled"), VERSION); - ---- a/src/option.c -+++ b/src/option.c -@@ -2603,8 +2603,6 @@ static int one_opt(int option, char *arg - - if (size < 0) - size = 0; -- else if (size > 10000) -- size = 10000; - - daemon->cachesize = size; - } -- cgit v1.2.3