From 6427530d52da395aa1e1b7598532d75f4d55e34e Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Thu, 30 Jul 2015 08:53:43 +0000 Subject: dnsmasq: Bump to dnsmasq2.74 Bump to dnsmasq2.74 & refresh patches to fix fuzz Signed-off-by: Kevin Darbyshire-Bryant git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46522 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch') diff --git a/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch b/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch index a502a60aee..f5b5ca04ec 100644 --- a/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch +++ b/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch @@ -9,7 +9,7 @@ struct iface_param parm; #ifdef HAVE_LINUX_NETWORK struct arpreq arp_req; -@@ -272,11 +272,9 @@ void dhcp_packet(time_t now, int pxe_fd) +@@ -275,11 +275,9 @@ void dhcp_packet(time_t now, int pxe_fd) { ifr.ifr_addr.sa_family = AF_INET; if (ioctl(daemon->dhcpfd, SIOCGIFADDR, &ifr) != -1 ) @@ -23,7 +23,7 @@ } for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next) -@@ -295,7 +293,7 @@ void dhcp_packet(time_t now, int pxe_fd) +@@ -298,7 +296,7 @@ void dhcp_packet(time_t now, int pxe_fd) parm.relay_local.s_addr = 0; parm.ind = iface_index; @@ -32,7 +32,7 @@ { /* If we failed to match the primary address of the interface, see if we've got a --listen-address for a secondary */ -@@ -315,6 +313,12 @@ void dhcp_packet(time_t now, int pxe_fd) +@@ -318,6 +316,12 @@ void dhcp_packet(time_t now, int pxe_fd) complete_context(match.addr, iface_index, NULL, match.netmask, match.broadcast, &parm); } -- cgit v1.2.3