From 3251ac8f2d3de29af2a1584f427246ea702fdbd9 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Sat, 9 Mar 2019 08:40:57 +0000 Subject: dnsmasq: bump to v2.81rc1 1st release candidate for v2.81 after 18 months. Refresh patches & remove all upstreamed leaving: 110-ipset-remove-old-kernel-support.patch Signed-off-by: Kevin Darbyshire-Bryant --- ...bug-in-cache-marshalling-code.-Introduced.patch | 23 ---------------------- 1 file changed, 23 deletions(-) delete mode 100644 package/network/services/dnsmasq/patches/0022-File-logic-bug-in-cache-marshalling-code.-Introduced.patch (limited to 'package/network/services/dnsmasq/patches/0022-File-logic-bug-in-cache-marshalling-code.-Introduced.patch') diff --git a/package/network/services/dnsmasq/patches/0022-File-logic-bug-in-cache-marshalling-code.-Introduced.patch b/package/network/services/dnsmasq/patches/0022-File-logic-bug-in-cache-marshalling-code.-Introduced.patch deleted file mode 100644 index 32a02cd56a..0000000000 --- a/package/network/services/dnsmasq/patches/0022-File-logic-bug-in-cache-marshalling-code.-Introduced.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 2c594732eb7391e7cfa817598e33e61cab71131f Mon Sep 17 00:00:00 2001 -From: Simon Kelley -Date: Thu, 3 Jan 2019 13:42:03 +0000 -Subject: [PATCH 22/32] File logic bug in cache-marshalling code. Introduced a - couple of commits back. - -Signed-off-by: Kevin Darbyshire-Bryant ---- - src/cache.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - ---- a/src/cache.c -+++ b/src/cache.c -@@ -742,8 +742,7 @@ int cache_recv_insert(time_t now, int fd - else if (flags & F_DS) - { - if (!read_write(fd, (unsigned char *)&class, sizeof(class), 1) || -- (flags & F_NEG) || -- !(addr.key.keydata = blockdata_read(fd, addr.key.keylen))) -+ (!(flags & F_NEG) && !(addr.key.keydata = blockdata_read(fd, addr.key.keylen)))) - return 0; - } - #endif -- cgit v1.2.3