This patch updates dnsmasq to version 2.66. Memset issue patch included- thanks
Gilles
for the hint
(http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2013q2/007052.html).
Signed-off-by: Christoph König <christoph.koenig+open...@gmail.com>
---
Index:
package/network/services/dnsmasq/patches/110-fix-incorrect-length-memset.patch
===================================================================
---
package/network/services/dnsmasq/patches/110-fix-incorrect-length-memset.patch
(Revision 0)
+++
package/network/services/dnsmasq/patches/110-fix-incorrect-length-memset.patch
(Arbeitskopie)
@@ -0,0 +1,12 @@
+--- a/src/ipset.c
++++ b/src/ipset.c
+@@ -110,7 +110,8 @@ static int new_add_to_ipset(const char *
+ return -1;
+ }
+
+- memset(buffer, 0, sizeof(buffer));
++ //see also:
http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2013q2/007052.html
++ memset(buffer, 0, BUFF_SZ);
+
+ nlh = (struct nlmsghdr *)buffer;
+ nlh->nlmsg_len = NL_ALIGN(sizeof(struct nlmsghdr));
Index:
package/network/services/dnsmasq/patches/0001-Set-prefix-on-link-bit-in-RAs.patch
===================================================================
---
package/network/services/dnsmasq/patches/0001-Set-prefix-on-link-bit-in-RAs.patch
(Revision 36409)
+++
package/network/services/dnsmasq/patches/0001-Set-prefix-on-link-bit-in-RAs.patch
(Arbeitskopie)
@@ -1,42 +0,0 @@
-From fd05f127909bbf4f6983a4de2dcb611947488dee Mon Sep 17 00:00:00 2001
-From: Simon Kelley <si...@thekelleys.org.uk>
-Date: Sun, 12 Aug 2012 17:48:50 +0100
-Subject: [PATCH] Set prefix on-link bit in RAs
-
----
- CHANGELOG | 3 +++
- src/radv.c | 4 ++--
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/CHANGELOG b/CHANGELOG
-index 8828694..e1daeef 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -45,6 +45,9 @@ version 2.63
- uk.org.thekelleys.dnsmasq. Thanks to Mathieu
- Trudel-Lapierre for the patch.
-
-+ Set the "prefix on-link" bit in Router
-+ Advertisements. Thanks to Gui Iribarren for the patch.
-+
-
- version 2.62
- Update German translation. Thanks to Conrad Kostecki.
-diff --git a/src/radv.c b/src/radv.c
-index a3e691a..d1f5268 100644
---- a/src/radv.c
-+++ b/src/radv.c
-@@ -412,8 +412,8 @@ static int add_prefixes(struct in6_addr *local, int
prefix,
- opt->type = ICMP6_OPT_PREFIX;
- opt->len = 4;
- opt->prefix_len = prefix;
-- /* autonomous only if we're not doing dhcp */
-- opt->flags = do_slaac ? 0x40 : 0x00;
-+ /* autonomous only if we're not doing dhcp, always set
"on-link" */
-+ opt->flags = do_slaac ? 0xC0 : 0x80;
- opt->valid_lifetime = htonl(time);
- opt->preferred_lifetime = htonl(deprecate ? 0 : time);
- opt->reserved = 0;
---
-1.7.10.GIT
-
Index:
package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch
===================================================================
---
package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch
(Revision 36409)
+++
package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch
(Arbeitskopie)
@@ -1,6 +1,6 @@
--- a/src/dhcp.c
+++ b/src/dhcp.c
-@@ -134,7 +134,7 @@ void dhcp_packet(time_t now, int pxe_fd)
+@@ -140,7 +140,7 @@ void dhcp_packet(time_t now, int pxe_fd)
struct iovec iov;
ssize_t sz;
int iface_index = 0, unicast_dest = 0, is_inform = 0;
@@ -9,7 +9,7 @@
struct iface_param parm;
#ifdef HAVE_LINUX_NETWORK
struct arpreq arp_req;
-@@ -246,11 +246,9 @@ void dhcp_packet(time_t now, int pxe_fd)
+@@ -252,11 +252,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,16 +23,17 @@
}
for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
-@@ -272,7 +270,7 @@ void dhcp_packet(time_t now, int pxe_fd)
+@@ -269,8 +267,7 @@ void dhcp_packet(time_t now, int pxe_fd)
+
parm.current = NULL;
parm.ind = iface_index;
-
-- if (!iface_check(AF_INET, (struct all_addr *)&iface_addr, ifr.ifr_name))
-+ if (!iface_check(AF_INET, (struct all_addr *)addrp, ifr.ifr_name))
+-
+- if (!iface_check(AF_INET, (struct all_addr *)&iface_addr, ifr.ifr_name,
NULL))
++ if (!iface_check(AF_INET, (struct all_addr *)addrp, ifr.ifr_name, NULL))
{
/* If we failed to match the primary address of the interface, see if
we've got a --listen-address
for a secondary */
-@@ -291,7 +289,13 @@ void dhcp_packet(time_t now, int pxe_fd)
+@@ -289,7 +286,13 @@ void dhcp_packet(time_t now, int pxe_fd)
there is more than one address on the interface in the same subnet */
complete_context(match.addr, iface_index, match.netmask,
match.broadcast, &parm);
}
Index: package/network/services/dnsmasq/Makefile
===================================================================
--- package/network/services/dnsmasq/Makefile (Revision 36409)
+++ package/network/services/dnsmasq/Makefile (Arbeitskopie)
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq
-PKG_VERSION:=2.62
-PKG_RELEASE:=3
+PKG_VERSION:=2.66
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
-PKG_MD5SUM:=f47e5cb8f5bac6343f24b2dbe317ab40
+PKG_MD5SUM:=c5eb8fb88847a5e9bf18db67c74efd47
PKG_LICENSE:=GPLv2
PKG_LICENSE_FILES:=COPYING
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
