Changeset 46522


Ignore:
Timestamp:
2015-07-30T10:53:43+02:00 (3 years ago)
Author:
cyrus
Message:

dnsmasq: Bump to dnsmasq2.74

Bump to dnsmasq2.74 & refresh patches to fix fuzz

Signed-off-by: Kevin Darbyshire-Bryant <kevin@…>

Location:
trunk/package/network/services/dnsmasq
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/network/services/dnsmasq/Makefile

    r45988 r46522  
    99 
    1010PKG_NAME:=dnsmasq 
    11 PKG_VERSION:=2.73 
     11PKG_VERSION:=2.74 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz 
    1515PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq 
    16 PKG_MD5SUM:=b8bfe96d22945c8cf4466826ba9b21bd 
     16PKG_MD5SUM:=f48cd0fe26a55617a375ffc95b71e3c3 
    1717 
    1818PKG_LICENSE:=GPL-2.0 
  • trunk/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch

    r41246 r46522  
    1010 #ifdef HAVE_LINUX_NETWORK 
    1111   struct arpreq arp_req; 
    12 @@ -272,11 +272,9 @@ void dhcp_packet(time_t now, int pxe_fd) 
     12@@ -275,11 +275,9 @@ void dhcp_packet(time_t now, int pxe_fd) 
    1313     { 
    1414       ifr.ifr_addr.sa_family = AF_INET; 
     
    2424        
    2525       for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next) 
    26 @@ -295,7 +293,7 @@ void dhcp_packet(time_t now, int pxe_fd) 
     26@@ -298,7 +296,7 @@ void dhcp_packet(time_t now, int pxe_fd) 
    2727       parm.relay_local.s_addr = 0; 
    2828       parm.ind = iface_index; 
     
    3333          /* If we failed to match the primary address of the interface, see if we've got a --listen-address 
    3434             for a secondary */ 
    35 @@ -315,6 +313,12 @@ void dhcp_packet(time_t now, int pxe_fd) 
     35@@ -318,6 +316,12 @@ void dhcp_packet(time_t now, int pxe_fd) 
    3636          complete_context(match.addr, iface_index, NULL, match.netmask, match.broadcast, &parm); 
    3737        }     
  • trunk/package/network/services/dnsmasq/patches/210-dnssec-improve-timestamp-heuristic.patch

    r45572 r46522  
    1111--- a/src/dnssec.c 
    1212+++ b/src/dnssec.c 
    13 @@ -432,17 +432,24 @@ static int back_to_the_future; 
     13@@ -429,17 +429,24 @@ static time_t timestamp_time; 
    1414 int setup_timestamp(void) 
    1515 { 
    1616   struct stat statbuf; 
    17  
    1817+  time_t now; 
    1918+  time_t base = 1420070400; /* 1-1-2015 */ 
    20 + 
    21    back_to_the_future = 0; 
     19    
     20   daemon->back_to_the_future = 0; 
    2221    
    2322   if (!daemon->timestamp_file) 
    2423     return 0; 
    25  
    2624+ 
    2725+  now = time(NULL); 
     
    2927+  if (!stat("/proc/self/exe", &statbuf) && difftime(statbuf.st_mtime, base) > 0) 
    3028+    base = statbuf.st_mtime; 
    31 + 
     29    
    3230   if (stat(daemon->timestamp_file, &statbuf) != -1) 
    3331     { 
     
    3533     check_and_exit: 
    3634-      if (difftime(timestamp_time, time(0)) <=  0) 
    37 +      if (difftime(now, base) >= 0 && difftime(timestamp_time, now) <=  0) 
     35+      if (difftime(now, base) >= 0 && difftime(timestamp_time, now) <= 0) 
    3836        { 
    3937          /* time already OK, update timestamp, and do key checking from the start. */ 
    4038          if (utime(daemon->timestamp_file, NULL) == -1) 
    41 @@ -463,7 +470,7 @@ int setup_timestamp(void) 
     39@@ -460,7 +467,7 @@ int setup_timestamp(void) 
    4240  
    4341          close(fd); 
Note: See TracChangeset for help on using the changeset viewer.