diff options
| author | Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk> | 2017-10-02 15:17:07 +0100 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2017-10-02 18:26:53 +0200 |
| commit | 67ac017fefe8552b4e864d0494e892efe4fb9710 (patch) | |
| tree | 8a72111fbee12df71e25c611c07507cdeae9b0c6 /package/network/services/dnsmasq/patches/240-ubus.patch | |
| parent | 64da598c8f8bc3002ae2e8f90f0cf20986493348 (diff) | |
| download | upstream-67ac017fefe8552b4e864d0494e892efe4fb9710.tar.gz upstream-67ac017fefe8552b4e864d0494e892efe4fb9710.tar.bz2 upstream-67ac017fefe8552b4e864d0494e892efe4fb9710.zip | |
dnsmasq: bump to v2.78
Fixes CVE-2017-14491, CVE-2017-14492, CVE-2017-14493, CVE-2017-14494, 2017-CVE-14495, 2017-CVE-14496
Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
Diffstat (limited to 'package/network/services/dnsmasq/patches/240-ubus.patch')
| -rw-r--r-- | package/network/services/dnsmasq/patches/240-ubus.patch | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/package/network/services/dnsmasq/patches/240-ubus.patch b/package/network/services/dnsmasq/patches/240-ubus.patch index 41e2848594..2d37b5d2fd 100644 --- a/package/network/services/dnsmasq/patches/240-ubus.patch +++ b/package/network/services/dnsmasq/patches/240-ubus.patch @@ -1,16 +1,14 @@ -Index: dnsmasq-2.77/src/dnsmasq.c -=================================================================== ---- dnsmasq-2.77.orig/src/dnsmasq.c -+++ dnsmasq-2.77/src/dnsmasq.c -@@ -17,6 +17,8 @@ - /* Declare static char *compiler_opts in config.h */ - #define DNSMASQ_COMPILE_OPTS +--- a/src/dnsmasq.c ++++ b/src/dnsmasq.c +@@ -19,6 +19,8 @@ -+#include <libubus.h> -+ #include "dnsmasq.h" ++#include <libubus.h> ++ struct daemon *daemon; + + static volatile pid_t pid = 0; @@ -32,6 +34,62 @@ static void fatal_event(struct event_des static int read_event(int fd, struct event_desc *evp, char **msg); static void poll_resolv(int force, int do_reload, time_t now); @@ -91,10 +89,8 @@ Index: dnsmasq-2.77/src/dnsmasq.c check_dns_listeners(now); #ifdef HAVE_TFTP -Index: dnsmasq-2.77/Makefile -=================================================================== ---- dnsmasq-2.77.orig/Makefile -+++ dnsmasq-2.77/Makefile +--- a/Makefile ++++ b/Makefile @@ -85,7 +85,7 @@ all : $(BUILDDIR) @cd $(BUILDDIR) && $(MAKE) \ top="$(top)" \ @@ -104,11 +100,9 @@ Index: dnsmasq-2.77/Makefile -f $(top)/Makefile dnsmasq mostly_clean : -Index: dnsmasq-2.77/src/dnsmasq.h -=================================================================== ---- dnsmasq-2.77.orig/src/dnsmasq.h -+++ dnsmasq-2.77/src/dnsmasq.h -@@ -1389,6 +1389,8 @@ void emit_dbus_signal(int action, struct +--- a/src/dnsmasq.h ++++ b/src/dnsmasq.h +@@ -1397,6 +1397,8 @@ void emit_dbus_signal(int action, struct # endif #endif @@ -117,10 +111,8 @@ Index: dnsmasq-2.77/src/dnsmasq.h /* ipset.c */ #ifdef HAVE_IPSET void ipset_init(void); -Index: dnsmasq-2.77/src/rfc2131.c -=================================================================== ---- dnsmasq-2.77.orig/src/rfc2131.c -+++ dnsmasq-2.77/src/rfc2131.c +--- a/src/rfc2131.c ++++ b/src/rfc2131.c @@ -1621,6 +1621,10 @@ static void log_packet(char *type, void daemon->namebuff, string ? string : "", |