diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2009-02-16 04:48:08 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2009-02-16 04:48:08 +0000 |
commit | e86bf4c86c1a462a858fed0cc191fd100d688e8f (patch) | |
tree | 09fea28c4a394f5bbab4ab0d44342c8de409182a /package | |
parent | fdd629c8519134583dcf95c3859faa7ee11ef309 (diff) | |
download | upstream-e86bf4c86c1a462a858fed0cc191fd100d688e8f.tar.gz upstream-e86bf4c86c1a462a858fed0cc191fd100d688e8f.tar.bz2 upstream-e86bf4c86c1a462a858fed0cc191fd100d688e8f.zip |
update dnsmasq to 2.47 (#4636, thanks florida)
SVN-Revision: 14528
Diffstat (limited to 'package')
-rw-r--r-- | package/dnsmasq/Makefile | 6 | ||||
-rw-r--r-- | package/dnsmasq/patches/101-ipv6.patch | 8 | ||||
-rw-r--r-- | package/dnsmasq/patches/102-rtnetlink.patch | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 97f5d094df..06bcbfcce0 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.46 +PKG_VERSION:=2.47 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq -PKG_MD5SUM:=79ec740d1a10ee75f13efa4ff36d0250 +PKG_MD5SUM:=4524081e56d0b935717d493e8e8d3e11 include $(INCLUDE_DIR)/package.mk diff --git a/package/dnsmasq/patches/101-ipv6.patch b/package/dnsmasq/patches/101-ipv6.patch index 320709f613..682447c8d4 100644 --- a/package/dnsmasq/patches/101-ipv6.patch +++ b/package/dnsmasq/patches/101-ipv6.patch @@ -1,8 +1,8 @@ -Index: dnsmasq-2.44/src/config.h +Index: dnsmasq-2.47/src/config.h =================================================================== ---- dnsmasq-2.44.orig/src/config.h 2008-07-20 17:17:39.000000000 +0200 -+++ dnsmasq-2.44/src/config.h 2008-07-20 17:20:08.000000000 +0200 -@@ -286,8 +286,9 @@ +--- dnsmasq-2.47.orig/src/config.h 2009-02-15 19:05:25.000000000 +0200 ++++ dnsmasq-2.47/src/config.h 2009-02-15 19:05:25.000000000 +0200 +@@ -282,8 +282,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 613b6b81fe..932c7e66bf 100644 --- a/package/dnsmasq/patches/102-rtnetlink.patch +++ b/package/dnsmasq/patches/102-rtnetlink.patch @@ -1,6 +1,6 @@ -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 +diff -ur dnsmasq-2.47.orig/src/netlink.c dnsmasq-2.47/src/netlink.c +--- dnsmasq-2.47.orig/src/netlink.c 2009-02-15 19:05:25.000000000 +0200 ++++ dnsmasq-2.47/src/netlink.c 2008-02-15 19:05:25.000000000 +0200 @@ -21,6 +21,10 @@ #include <linux/types.h> #include <linux/netlink.h> |