Changeset 36412


Ignore:
Timestamp:
2013-04-24T07:55:39+02:00 (5 years ago)
Author:
cyrus
Message:

dnsmasq: update to 2.66
Thanks to Christoph König for patches.

Location:
trunk/package/network/services/dnsmasq
Files:
1 added
1 deleted
2 edited

Legend:

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

    r34971 r36412  
    99 
    1010PKG_NAME:=dnsmasq 
    11 PKG_VERSION:=2.62 
    12 PKG_RELEASE:=3 
     11PKG_VERSION:=2.66 
     12PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1515PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq 
    16 PKG_MD5SUM:=f47e5cb8f5bac6343f24b2dbe317ab40 
     16PKG_MD5SUM:=c5eb8fb88847a5e9bf18db67c74efd47 
    1717 
    1818PKG_LICENSE:=GPLv2 
     
    6464TARGET_CFLAGS += \ 
    6565        -ffunction-sections -fdata-sections \ 
    66         $(if $(CONFIG_IPV6),,-DNO_IPV6) 
     66        $(if $(CONFIG_IPV6),,-DNO_IPV6) -DNO_IPSET -DNO_AUTH 
    6767 
    6868ifeq ($(BUILD_VARIANT),nodhcpv6) 
  • trunk/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch

    r32781 r36412  
    1 --- a/src/dhcp.c 
    2 +++ b/src/dhcp.c 
    3 @@ -134,7 +134,7 @@ void dhcp_packet(time_t now, int pxe_fd) 
     1Index: dnsmasq-2.66/src/dhcp.c 
     2=================================================================== 
     3--- dnsmasq-2.66.orig/src/dhcp.c        2013-04-17 14:52:49.000000000 +0200 
     4+++ dnsmasq-2.66/src/dhcp.c     2013-04-24 08:24:20.393711625 +0200 
     5@@ -140,7 +140,7 @@ 
    46   struct iovec iov; 
    57   ssize_t sz;  
     
    1012 #ifdef HAVE_LINUX_NETWORK 
    1113   struct arpreq arp_req; 
    12 @@ -246,11 +246,9 @@ void dhcp_packet(time_t now, int pxe_fd) 
     14@@ -252,11 +252,9 @@ 
    1315    
    1416   ifr.ifr_addr.sa_family = AF_INET; 
     
    2426    
    2527   for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next) 
    26 @@ -272,7 +270,7 @@ void dhcp_packet(time_t now, int pxe_fd) 
     28@@ -270,7 +268,7 @@ 
    2729   parm.current = NULL; 
    2830   parm.ind = iface_index; 
    2931  
    30 -  if (!iface_check(AF_INET, (struct all_addr *)&iface_addr, ifr.ifr_name)) 
    31 +  if (!iface_check(AF_INET, (struct all_addr *)addrp, ifr.ifr_name)) 
     32-  if (!iface_check(AF_INET, (struct all_addr *)&iface_addr, ifr.ifr_name, NULL)) 
     33+  if (!iface_check(AF_INET, (struct all_addr *)addrp, ifr.ifr_name, NULL)) 
    3234     { 
    3335       /* If we failed to match the primary address of the interface, see if we've got a --listen-address 
    3436         for a secondary */ 
    35 @@ -291,7 +289,13 @@ void dhcp_packet(time_t now, int pxe_fd) 
     37@@ -289,7 +287,13 @@ 
    3638         there is more than one address on the interface in the same subnet */ 
    3739       complete_context(match.addr, iface_index, match.netmask, match.broadcast, &parm); 
Note: See TracChangeset for help on using the changeset viewer.