Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dnsmasq: Bump to dnsmasq2.74

Browse source 
Bump to dnsmasq2.74 & refresh patches to fix fuzz

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>

SVN-Revision: 46522
This commit is contained in:
Steven Barth 2015-07-30 08:53:43 +00:00
parent c668c8cc32
commit 677f0e3e72
3 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package/network/services/dnsmasq/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq PKG_NAME:=dnsmasq
PKG_VERSION:=2.73 PKG_VERSION:=2.74
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
PKG_MD5SUM:=b8bfe96d22945c8cf4466826ba9b21bd PKG_MD5SUM:=f48cd0fe26a55617a375ffc95b71e3c3
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING

6
package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch
View file

@ -9,7 +9,7 @@
struct iface_param parm; struct iface_param parm;
#ifdef HAVE_LINUX_NETWORK #ifdef HAVE_LINUX_NETWORK
struct arpreq arp_req; 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; ifr.ifr_addr.sa_family = AF_INET;
if (ioctl(daemon->dhcpfd, SIOCGIFADDR, &ifr) != -1 ) if (ioctl(daemon->dhcpfd, SIOCGIFADDR, &ifr) != -1 )
@ -23,7 +23,7 @@
} }
for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next) 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.relay_local.s_addr = 0;
parm.ind = iface_index; 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 /* If we failed to match the primary address of the interface, see if we've got a --listen-address
for a secondary */ 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); complete_context(match.addr, iface_index, NULL, match.netmask, match.broadcast, &parm);
} }

14
package/network/services/dnsmasq/patches/210-dnssec-improve-timestamp-heuristic.patch
View file

@ -10,35 +10,33 @@ Signed-off-by: Steven Barth <steven@midlink.org>
--- a/src/dnssec.c --- a/src/dnssec.c
+++ b/src/dnssec.c +++ b/src/dnssec.c
@@ -432,17 +432,24 @@ static int back_to_the_future; @@ -429,17 +429,24 @@ static time_t timestamp_time;
int setup_timestamp(void) int setup_timestamp(void)
{ {
struct stat statbuf; struct stat statbuf;
-
+ time_t now; + time_t now;
+ time_t base = 1420070400; /* 1-1-2015 */ + time_t base = 1420070400; /* 1-1-2015 */
+
back_to_the_future = 0; daemon->back_to_the_future = 0;
if (!daemon->timestamp_file) if (!daemon->timestamp_file)
return 0; return 0;
-
+ +
+ now = time(NULL); + now = time(NULL);
+ +
+ if (!stat("/proc/self/exe", &statbuf) && difftime(statbuf.st_mtime, base) > 0) + if (!stat("/proc/self/exe", &statbuf) && difftime(statbuf.st_mtime, base) > 0)
+ base = statbuf.st_mtime; + base = statbuf.st_mtime;
+
if (stat(daemon->timestamp_file, &statbuf) != -1) if (stat(daemon->timestamp_file, &statbuf) != -1)
{ {
timestamp_time = statbuf.st_mtime; timestamp_time = statbuf.st_mtime;
check_and_exit: check_and_exit:
- if (difftime(timestamp_time, time(0)) <= 0) - if (difftime(timestamp_time, time(0)) <= 0)
+ if (difftime(now, base) >= 0 && difftime(timestamp_time, now) <= 0) + if (difftime(now, base) >= 0 && difftime(timestamp_time, now) <= 0)
{ {
/* time already OK, update timestamp, and do key checking from the start. */ /* time already OK, update timestamp, and do key checking from the start. */
if (utime(daemon->timestamp_file, NULL) == -1) if (utime(daemon->timestamp_file, NULL) == -1)
@@ -463,7 +470,7 @@ int setup_timestamp(void) @@ -460,7 +467,7 @@ int setup_timestamp(void)
close(fd); close(fd);