[package] nvram: handle nvram at varying offsets within the eraseblock (fixes Edimax...

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

diff --git a/package/dnsmasq/patches/101-ipv6.patch b/package/dnsmasq/patches/101-ipv6.patch
index e11c980..2876d3e 100644 (file)
--- a/package/dnsmasq/patches/101-ipv6.patch
+++ b/package/dnsmasq/patches/101-ipv6.patch
@@ -1,14 +1,13 @@
-diff -ur dnsmasq-2.42.orig/src/config.h dnsmasq-2.42/src/config.h
---- dnsmasq-2.42.orig/src/config.h     2008-06-03 16:38:25.000000000 +0200
-+++ dnsmasq-2.42/src/config.h  2008-06-03 16:38:43.000000000 +0200
-@@ -322,8 +322,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
  /* 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
  #  define ADDRSTRLEN INET6_ADDRSTRLEN
  #  if defined(SOL_IPV6)
  #    define IPV6_LEVEL SOL_IPV6