Revert "dnsmasq: Update to version 2.86test3"

This reverts commit 3628870015. dnsmasq v2.86test3 has some issues with ubus, so is being reverted. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2021-06-26 20:31:29 +01:00 · 2021-06-26 20:31:29 +01:00 · 9441993198
commit 9441993198
parent bd251a0b33
4 changed files with 34 additions and 34 deletions
--- a/package/network/services/dnsmasq/Makefile
+++ b/package/network/services/dnsmasq/Makefile
@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=dnsmasq
-PKG_VERSION:=2.86test3
+PKG_VERSION:=2.85
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq/test-releases
-PKG_HASH:=0d0b465db89390e9f518f1239dec88b458c84489e7fd38586af6a5781f85e7db
+PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
+PKG_HASH:=ad98d3803df687e5b938080f3d25c628fe41c878752d03fbc6199787fee312fa

 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
--- a/package/network/services/dnsmasq/patches/100-remove-old-runtime-kernel-support.patch
+++ b/package/network/services/dnsmasq/patches/100-remove-old-runtime-kernel-support.patch
@ -26,7 +26,7 @@ Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
 
 --- a/src/dnsmasq.h
 +++ b/src/dnsmasq.h
-@@ -1185,7 +1185,7 @@ extern struct daemon {
+@@ -1144,7 +1144,7 @@ extern struct daemon {
   int inotifyfd;
 #endif
 #if defined(HAVE_LINUX_NETWORK)
@ -35,7 +35,7 @@ Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
 #elif defined(HAVE_BSD_NETWORK)
   int dhcp_raw_fd, dhcp_icmp_fd, routefd;
 #endif
-@@ -1368,9 +1368,6 @@ int read_write(int fd, unsigned char *pa
+@@ -1326,9 +1326,6 @@ int read_write(int fd, unsigned char *pa
 void close_fds(long max_fd, int spare1, int spare2, int spare3);
 int wildcard_match(const char* wildcard, const char* match);
 int wildcard_matchn(const char* wildcard, const char* match, int num);
--- a/package/network/services/dnsmasq/patches/910-mini-ttl.patch
+++ b/package/network/services/dnsmasq/patches/910-mini-ttl.patch
@ -1,25 +1,25 @@
 --- a/src/dnsmasq.h
 +++ b/src/dnsmasq.h
-@@ -1100,7 +1100,7 @@ extern struct daemon {
+@@ -1059,7 +1059,7 @@ extern struct daemon {
   int max_logs;  /* queue limit */
   int cachesize, ftabsize;
   int port, query_port, min_port, max_port;
 -  unsigned long local_ttl, neg_ttl, max_ttl, min_cache_ttl, max_cache_ttl, auth_ttl, dhcp_ttl, use_dhcp_ttl;
 +  unsigned long local_ttl, neg_ttl, min_ttl, max_ttl, min_cache_ttl, max_cache_ttl, auth_ttl, dhcp_ttl, use_dhcp_ttl;
   char *dns_client_id;
-   u32 umbrella_org;
-   u32 umbrella_asset;
+   struct hostsfile *addn_hosts;
+   struct dhcp_context *dhcp, *dhcp6;
 --- a/src/option.c
 +++ b/src/option.c
-@@ -173,6 +173,7 @@ struct myoption {
- #define LOPT_UMBRELLA	   364
- #define LOPT_CMARK_ALST_EN 365
- #define LOPT_CMARK_ALST    366
-+#define LOPT_MINTTL        367
+@@ -170,6 +170,7 @@ struct myoption {
+ #define LOPT_PXE_VENDOR    361
+ #define LOPT_DYNHOST       362
+ #define LOPT_LOG_DEBUG     363
+#define LOPT_MINTTL        364
  
 #ifdef HAVE_GETOPT_LONG
 static const struct option opts[] =  
-@@ -291,6 +292,7 @@ static const struct myoption opts[] =
+@@ -288,6 +289,7 @@ static const struct myoption opts[] =
     { "dhcp-name-match", 1, 0, LOPT_NAME_MATCH },
     { "dhcp-broadcast", 2, 0, LOPT_BROADCAST },
     { "neg-ttl", 1, 0, LOPT_NEGTTL },
@ -27,7 +27,7 @@
     { "max-ttl", 1, 0, LOPT_MAXTTL },
     { "min-cache-ttl", 1, 0, LOPT_MINCTTL },
     { "max-cache-ttl", 1, 0, LOPT_MAXCTTL },
-@@ -423,6 +425,7 @@ static struct {
+@@ -417,6 +419,7 @@ static struct {
   { 't', ARG_ONE, "<host_name>", gettext_noop("Specify default target in an MX record."), NULL },
   { 'T', ARG_ONE, "<integer>", gettext_noop("Specify time-to-live in seconds for replies from /etc/hosts."), NULL },
   { LOPT_NEGTTL, ARG_ONE, "<integer>", gettext_noop("Specify time-to-live in seconds for negative caching."), NULL },
@ -35,7 +35,7 @@
   { LOPT_MAXTTL, ARG_ONE, "<integer>", gettext_noop("Specify time-to-live in seconds for maximum TTL to send to clients."), NULL },
   { LOPT_MAXCTTL, ARG_ONE, "<integer>", gettext_noop("Specify time-to-live ceiling for cache."), NULL },
   { LOPT_MINCTTL, ARG_ONE, "<integer>", gettext_noop("Specify time-to-live floor for cache."), NULL },
-@@ -3101,6 +3104,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
+@@ -2835,6 +2838,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
       
     case 'T':         /* --local-ttl */
     case LOPT_NEGTTL: /* --neg-ttl */
@ -43,7 +43,7 @@
     case LOPT_MAXTTL: /* --max-ttl */
     case LOPT_MINCTTL: /* --min-cache-ttl */
     case LOPT_MAXCTTL: /* --max-cache-ttl */
-@@ -3112,6 +3116,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
+@@ -2846,6 +2850,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
 	  ret_err(gen_err);
 	else if (option == LOPT_NEGTTL)
 	  daemon->neg_ttl = (unsigned long)ttl;
--- a/package/network/services/dnsmasq/patches/911-dnsmasq-filter-aaaa.patch
+++ b/package/network/services/dnsmasq/patches/911-dnsmasq-filter-aaaa.patch
@ -11,45 +11,45 @@ Subject: [PATCH] add filter-aaaa option

 --- a/src/dnsmasq.h
 +++ b/src/dnsmasq.h
-@@ -273,7 +273,8 @@ struct event_desc {
- #define OPT_UMBRELLA       63
- #define OPT_UMBRELLA_DEVID 64
- #define OPT_CMARK_ALST_EN  65
-#define OPT_LAST           66
-+#define OPT_FILTER_AAAA    66
-+#define OPT_LAST           67
+@@ -270,7 +270,8 @@ struct event_desc {
+ #define OPT_SINGLE_PORT    60
+ #define OPT_LEASE_RENEW    61
+ #define OPT_LOG_DEBUG      62
+-#define OPT_LAST           63
+#define OPT_FILTER_AAAA    63
+#define OPT_LAST           64
 
 #define OPTION_BITS (sizeof(unsigned int)*8)
 #define OPTION_SIZE ( (OPT_LAST/OPTION_BITS)+((OPT_LAST%OPTION_BITS)!=0) )
 --- a/src/option.c
 +++ b/src/option.c
-@@ -174,6 +174,7 @@ struct myoption {
- #define LOPT_CMARK_ALST_EN 365
- #define LOPT_CMARK_ALST    366
- #define LOPT_MINTTL        367
-+#define LOPT_FILTER_AAAA   368
+@@ -171,6 +171,7 @@ struct myoption {
+ #define LOPT_DYNHOST       362
+ #define LOPT_LOG_DEBUG     363
+ #define LOPT_MINTTL        364
+#define LOPT_FILTER_AAAA   365
  
 #ifdef HAVE_GETOPT_LONG
 static const struct option opts[] =  
-@@ -353,6 +354,7 @@ static const struct myoption opts[] =
+@@ -347,6 +348,7 @@ static const struct myoption opts[] =
+     { "dhcp-ignore-clid", 0, 0,  LOPT_IGNORE_CLID },
     { "dynamic-host", 1, 0, LOPT_DYNHOST },
     { "log-debug", 0, 0, LOPT_LOG_DEBUG },
- 	{ "umbrella", 2, 0, LOPT_UMBRELLA },
 +    { "filter-aaaa", 0, 0, LOPT_FILTER_AAAA },
     { NULL, 0, 0, 0 }
   };
 
-@@ -539,6 +541,7 @@ static struct {
+@@ -530,6 +532,7 @@ static struct {
+   { LOPT_DUMPFILE, ARG_ONE, "<path>", gettext_noop("Path to debug packet dump file"), NULL },
   { LOPT_DUMPMASK, ARG_ONE, "<hex>", gettext_noop("Mask which packets to dump"), NULL },
   { LOPT_SCRIPT_TIME, OPT_LEASE_RENEW, NULL, gettext_noop("Call dhcp-script when lease expiry changes."), NULL },
-   { LOPT_UMBRELLA, ARG_ONE, "[=<optspec>]", gettext_noop("Send Cisco Umbrella identifiers including remote IP."), 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
-@@ -1948,6 +1948,16 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
+@@ -1913,6 +1913,16 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
 	    }
 	}