Signed-off-by: Jonathan McCrohan <jmccro...@gmail.com> --- package/dnsmasq/Makefile | 6 +++--- package/dnsmasq/patches/101-ipv6.patch | 12 +++++++----- 2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 9fc70b3..c0d9c8a 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.59 -PKG_RELEASE:=3 +PKG_VERSION:=2.61 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq -PKG_MD5SUM:=b5757ef2d7b651748eeebb88af29d7d6 +PKG_MD5SUM:=6ed0a5c2524dfc3a74ef494ee2469f09 PKG_INSTALL:=1 diff --git a/package/dnsmasq/patches/101-ipv6.patch b/package/dnsmasq/patches/101-ipv6.patch index 5a0c01b..8e5f3af 100644 --- a/package/dnsmasq/patches/101-ipv6.patch +++ b/package/dnsmasq/patches/101-ipv6.patch @@ -1,13 +1,15 @@ +diff --git a/src/config.h b/src/config.h +index 84025f7..3c8d8c2 100644 --- a/src/config.h +++ b/src/config.h -@@ -263,8 +263,9 @@ NOTES: +@@ -255,8 +255,9 @@ HAVE_SOCKADDR_SA_LEN /* 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) +-#if defined(INET6_ADDRSTRLEN) && defined(IPV6_V6ONLY) ++#if defined(INET6_ADDRSTRLEN) # define HAVE_IPV6 +# define IPV6_V6ONLY 26 # define ADDRSTRLEN INET6_ADDRSTRLEN - # if defined(SOL_IPV6) - # define IPV6_LEVEL SOL_IPV6 + #elif defined(INET_ADDRSTRLEN) + # undef HAVE_IPV6 -- 1.7.10 _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel