From 1f74b8f8966452f9abbe4a4bf60b12be2722874c Mon Sep 17 00:00:00 2001
From: cyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 3 Jun 2008 15:06:20 +0000
Subject: Updated Dnsmasq to 2.42 (#3498)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11339 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/dnsmasq/Makefile                    | 4 ++--
 package/dnsmasq/patches/101-ipv6.patch      | 9 ++++-----
 package/dnsmasq/patches/102-rtnetlink.patch | 9 ++++-----
 3 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'package/dnsmasq')

diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index c5b571831..dab9adad7 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
-PKG_VERSION:=2.41
+PKG_VERSION:=2.42
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
-PKG_MD5SUM:=b067598c3e9b91819a8be5cb59cbf90e
+PKG_MD5SUM:=78a23a31a35b8427a8589b76c1ae3ff6
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/dnsmasq/patches/101-ipv6.patch b/package/dnsmasq/patches/101-ipv6.patch
index 598acf31b..e11c98008 100644
--- a/package/dnsmasq/patches/101-ipv6.patch
+++ b/package/dnsmasq/patches/101-ipv6.patch
@@ -1,8 +1,7 @@
-Index: dnsmasq-2.40/src/config.h
-===================================================================
---- 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 @@
+diff -ur dnsmasq-2.42.orig/src/config.h dnsmasq-2.42/src/config.h
+--- dnsmasq-2.42.orig/src/config.h	2008-06-03 16:38:25.000000000 +0200
++++ dnsmasq-2.42/src/config.h	2008-06-03 16:38:43.000000000 +0200
+@@ -322,8 +322,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 f1719bde7..613b6b81f 100644
--- a/package/dnsmasq/patches/102-rtnetlink.patch
+++ b/package/dnsmasq/patches/102-rtnetlink.patch
@@ -1,8 +1,7 @@
-Index: dnsmasq-2.40/src/netlink.c
-===================================================================
---- 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 @@
+diff -ur dnsmasq-2.42.orig/src/netlink.c dnsmasq-2.42/src/netlink.c
+--- dnsmasq-2.42.orig/src/netlink.c	2008-06-03 16:38:25.000000000 +0200
++++ dnsmasq-2.42/src/netlink.c	2008-06-03 16:41:06.000000000 +0200
+@@ -21,6 +21,10 @@
  #include <linux/types.h>
  #include <linux/netlink.h>
  #include <linux/rtnetlink.h>
-- 
cgit v1.2.3