diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 93c358aa3a..a23e9ff795 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -8,18 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.60-1-1-git +PKG_VERSION:=2.59 PKG_RELEASE:=2 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=git://thekelleys.org.uk/dnsmasq.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=0793380b4038e5cf4c0ebaac27c0dda8cd0e232c -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz - -#PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -#PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq -#PKG_MD5SUM:=b5757ef2d7b651748eeebb88af29d7d6 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq +PKG_MD5SUM:=b5757ef2d7b651748eeebb88af29d7d6 PKG_INSTALL:=1 diff --git a/package/dnsmasq/patches/101-ipv6.patch b/package/dnsmasq/patches/101-ipv6.patch new file mode 100644 index 0000000000..5a0c01b141 --- /dev/null +++ b/package/dnsmasq/patches/101-ipv6.patch @@ -0,0 +1,13 @@ +--- a/src/config.h ++++ b/src/config.h +@@ -263,8 +263,9 @@ NOTES: + /* We assume that systems which don't have IPv6 + headers don't have ntop and pton either */ + +-#if defined(INET6_ADDRSTRLEN) && defined(IPV6_V6ONLY) && !defined(NO_IPV6) ++#if defined(INET6_ADDRSTRLEN) && !defined(NO_IPV6) + # define HAVE_IPV6 ++# define IPV6_V6ONLY 26 + # define ADDRSTRLEN INET6_ADDRSTRLEN + # if defined(SOL_IPV6) + # define IPV6_LEVEL SOL_IPV6