diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-03-16 21:31:14 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-03-16 21:31:14 +0000 |
| commit | 7ce368ad28c5a05c7ab7896df17a95b3debdeacb (patch) | |
| tree | 984aaf8a786858cc23edbc9fa78f65419635a3ec /openwrt | |
| parent | b2af81841f59dee044c98a808b3c001bcd701854 (diff) | |
Updated to latest upstream version, remove uneeded patch as it is now in dnsmasq source code, closes #378
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3386 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt')
| -rw-r--r-- | openwrt/package/dnsmasq/Makefile | 4 | ||||
| -rw-r--r-- | openwrt/package/dnsmasq/patches/102-domain_wildcard_fix.patch | 12 |
2 files changed, 2 insertions, 14 deletions
diff --git a/openwrt/package/dnsmasq/Makefile b/openwrt/package/dnsmasq/Makefile index eeaad10e4..393f0f014 100644 --- a/openwrt/package/dnsmasq/Makefile +++ b/openwrt/package/dnsmasq/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.26 +PKG_VERSION:=2.27 PKG_RELEASE:=1 -PKG_MD5SUM:=ae04abb5db4a8cc43c24f432f0c44d5c +PKG_MD5SUM:=489198ec87101087043adc98bbe062dc PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/openwrt/package/dnsmasq/patches/102-domain_wildcard_fix.patch b/openwrt/package/dnsmasq/patches/102-domain_wildcard_fix.patch deleted file mode 100644 index 041cd67cf..000000000 --- a/openwrt/package/dnsmasq/patches/102-domain_wildcard_fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN dnsmasq.old/src/forward.c dnsmasq.dev/src/forward.c ---- dnsmasq.old/src/forward.c 2006-01-16 20:34:04.000000000 +0100 -+++ dnsmasq.dev/src/forward.c 2006-02-05 04:41:37.148190000 +0100 -@@ -164,7 +164,7 @@ - if (namelen >= domainlen && - hostname_isequal(matchstart, serv->domain) && - domainlen >= matchlen && -- (namelen == domainlen || *(serv->domain) == '.' || *(matchstart-1) == '.' )) -+ (namelen == domainlen || *(serv->domain) == '.' || *(matchstart-1) == '.' || domainlen == 0)) - { - unsigned short sflag = serv->addr.sa.sa_family == AF_INET ? F_IPV4 : F_IPV6; - *type = SERV_HAS_DOMAIN; |