diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-07-12 13:58:25 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-07-12 13:58:25 +0000 |
| commit | ae7ca82046265074a941a58c153c4d66ff305859 (patch) | |
| tree | cdee6fa005b6167f015056088deadcfdf9b86c6d /package | |
| parent | fe0ae487553eed7dda5fc06eb0a6ee1da446eec2 (diff) | |
upgrade dnsmasq (#1975)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7944 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/dnsmasq/Makefile | 4 | ||||
| -rw-r--r-- | package/dnsmasq/patches/101-ipv6.patch | 8 | ||||
| -rw-r--r-- | package/dnsmasq/patches/102-rtnetlink.patch | 6 | ||||
| -rw-r--r-- | package/dnsmasq/patches/103-hosts-fqdn.patch | 17 |
4 files changed, 9 insertions, 26 deletions
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 6b763741de..de2571a79d 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.38 +PKG_VERSION:=2.39 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq -PKG_MD5SUM:=ab066a97c226066485ad20e5ad5ce424 +PKG_MD5SUM:=1ffccc1f0d9b8a08f2b99e03ba9cc08b include $(INCLUDE_DIR)/package.mk diff --git a/package/dnsmasq/patches/101-ipv6.patch b/package/dnsmasq/patches/101-ipv6.patch index e107fe20f8..047d7efee4 100644 --- a/package/dnsmasq/patches/101-ipv6.patch +++ b/package/dnsmasq/patches/101-ipv6.patch @@ -1,8 +1,8 @@ -Index: dnsmasq-2.38/src/config.h +Index: dnsmasq-2.39/src/config.h =================================================================== ---- dnsmasq-2.38.orig/src/config.h 2007-06-04 13:22:23.553274640 +0200 -+++ dnsmasq-2.38/src/config.h 2007-06-04 13:22:23.626263544 +0200 -@@ -280,8 +280,9 @@ +--- 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 +@@ -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 3079c1eec3..79f3b4456d 100644 --- a/package/dnsmasq/patches/102-rtnetlink.patch +++ b/package/dnsmasq/patches/102-rtnetlink.patch @@ -1,7 +1,7 @@ -Index: dnsmasq-2.38/src/netlink.c +Index: dnsmasq-2.39/src/netlink.c =================================================================== ---- dnsmasq-2.38.orig/src/netlink.c 2007-06-04 13:22:23.531277984 +0200 -+++ dnsmasq-2.38/src/netlink.c 2007-06-04 13:22:23.814234968 +0200 +--- 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 @@ -17,6 +17,10 @@ #include <linux/types.h> #include <linux/netlink.h> diff --git a/package/dnsmasq/patches/103-hosts-fqdn.patch b/package/dnsmasq/patches/103-hosts-fqdn.patch deleted file mode 100644 index 243e73b02e..0000000000 --- a/package/dnsmasq/patches/103-hosts-fqdn.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: dnsmasq-2.38/src/cache.c -=================================================================== ---- dnsmasq-2.38.orig/src/cache.c 2007-06-04 13:22:23.510281176 +0200 -+++ dnsmasq-2.38/src/cache.c 2007-06-04 13:22:24.014204568 +0200 -@@ -749,10 +749,11 @@ - while ((token = strtok(NULL, " \t\n\r")) && (*token != '#')) - { - struct crec *cache; -+ int fqdn = !!strchr(token, '.'); - if (canonicalise(token)) - { - /* If set, add a version of the name with a default domain appended */ -- if ((opts & OPT_EXPAND) && domain_suffix && !strchr(token, '.') && -+ if ((opts & OPT_EXPAND) && domain_suffix && !fqdn && - (cache = malloc(sizeof(struct crec) + - strlen(token)+2+strlen(domain_suffix)-SMALLDNAME))) - { |