[backfire] merge r32648 and r32649 (#12005)

[openwrt-10.03/.git] / package / dnsmasq / patches / 101-ipv6.patch

diff --git a/package/dnsmasq/patches/101-ipv6.patch b/package/dnsmasq/patches/101-ipv6.patch
index 320709f613e6760cf7c1b1b52bd9ee8f30460ea7..2876d3eddacc45527700238da49fa8904cce674a 100644 (file)
--- a/package/dnsmasq/patches/101-ipv6.patch
+++ b/package/dnsmasq/patches/101-ipv6.patch
@@ -1,15 +1,13 @@
-Index: dnsmasq-2.44/src/config.h
-===================================================================
---- dnsmasq-2.44.orig/src/config.h     2008-07-20 17:17:39.000000000 +0200
-+++ dnsmasq-2.44/src/config.h  2008-07-20 17:20:08.000000000 +0200
-@@ -286,8 +286,9 @@
+--- 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