From: John Crispin <john@openwrt.org>
Date: Mon, 8 Oct 2007 21:44:25 +0000 (+0000)
Subject: update dnsmasq to 2.40, from #2479
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=1a1602af3b312afbd4431c515371be9bc7489ac9

update dnsmasq to 2.40, from #2479

SVN-Revision: 9200
---

diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 46769bd622..cb723d528f 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
-PKG_VERSION:=2.39
+PKG_VERSION:=2.40
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
-PKG_MD5SUM:=1ffccc1f0d9b8a08f2b99e03ba9cc08b
+PKG_MD5SUM:=91b6063ae81146b9d70b4381b2f3e44f
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/dnsmasq/patches/101-ipv6.patch b/package/dnsmasq/patches/101-ipv6.patch
index 047d7efee4..598acf31b3 100644
--- a/package/dnsmasq/patches/101-ipv6.patch
+++ b/package/dnsmasq/patches/101-ipv6.patch
@@ -1,7 +1,7 @@
-Index: dnsmasq-2.39/src/config.h
+Index: dnsmasq-2.40/src/config.h
 ===================================================================
---- dnsmasq-2.39.orig/src/config.h	2007-06-26 19:16:31.000000000 +0200
-+++ dnsmasq-2.39/src/config.h	2007-06-26 19:16:31.000000000 +0200
+--- dnsmasq-2.40.orig/src/config.h	2007-06-26 19:16:31.000000000 +0200
++++ dnsmasq-2.40/src/config.h	2007-06-26 19:16:31.000000000 +0200
 @@ -281,8 +281,9 @@
  /* We assume that systems which don't have IPv6
     headers don't have ntop and pton either */
diff --git a/package/dnsmasq/patches/102-rtnetlink.patch b/package/dnsmasq/patches/102-rtnetlink.patch
index 79f3b4456d..f1719bde79 100644
--- a/package/dnsmasq/patches/102-rtnetlink.patch
+++ b/package/dnsmasq/patches/102-rtnetlink.patch
@@ -1,7 +1,7 @@
-Index: dnsmasq-2.39/src/netlink.c
+Index: dnsmasq-2.40/src/netlink.c
 ===================================================================
---- dnsmasq-2.39.orig/src/netlink.c	2007-06-26 19:16:31.000000000 +0200
-+++ dnsmasq-2.39/src/netlink.c	2007-06-26 19:16:31.000000000 +0200
+--- dnsmasq-2.40.orig/src/netlink.c	2007-06-26 19:16:31.000000000 +0200
++++ dnsmasq-2.40/src/netlink.c	2007-06-26 19:16:31.000000000 +0200
 @@ -17,6 +17,10 @@
  #include <linux/types.h>
  #include <linux/netlink.h>