aboutsummaryrefslogtreecommitdiffstats
path: root/package/dnsmasq/patches/101-ipv6.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2010-01-29 23:15:44 +0000
committerHauke Mehrtens <hauke@openwrt.org>2010-01-29 23:15:44 +0000
commitf54859afb60d6aef4b11a2718e13dd795cae74fb (patch)
tree9a080996a52ecea54b3f54dd1cf9edc72d5407e0 /package/dnsmasq/patches/101-ipv6.patch
parent888b725c6f6cdd3c90ffe62771e3d0a2e6fb7eb8 (diff)
downloadupstream-f54859afb60d6aef4b11a2718e13dd795cae74fb.tar.gz
upstream-f54859afb60d6aef4b11a2718e13dd795cae74fb.tar.bz2
upstream-f54859afb60d6aef4b11a2718e13dd795cae74fb.zip
[dnsmasq] Update to version 2.52
Patch 103-ipv6_fix.patch is removed, because the problem the patch was fixing is now fixed in mainline. Thank you Raphaƫl HUCK for your patch. This fixes #6568. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19392 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/dnsmasq/patches/101-ipv6.patch')
-rw-r--r--package/dnsmasq/patches/101-ipv6.patch10
1 files changed, 4 insertions, 6 deletions
diff --git a/package/dnsmasq/patches/101-ipv6.patch b/package/dnsmasq/patches/101-ipv6.patch
index 945ddbba19..2876d3edda 100644
--- a/package/dnsmasq/patches/101-ipv6.patch
+++ b/package/dnsmasq/patches/101-ipv6.patch
@@ -1,15 +1,13 @@
-Index: dnsmasq-2.51/src/config.h
-===================================================================
---- dnsmasq-2.51.orig/src/config.h
-+++ dnsmasq-2.51/src/config.h
-@@ -270,8 +270,9 @@ NOTES:
+--- a/src/config.h
++++ b/src/config.h
+@@ -269,8 +269,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 IPV6_V6ONLY 26
# define ADDRSTRLEN INET6_ADDRSTRLEN
# if defined(SOL_IPV6)
# define IPV6_LEVEL SOL_IPV6