diff options
Diffstat (limited to 'testing/chromium/chromium-uclibc-resolv.patch')
| -rw-r--r-- | testing/chromium/chromium-uclibc-resolv.patch | 103 |
1 files changed, 78 insertions, 25 deletions
diff --git a/testing/chromium/chromium-uclibc-resolv.patch b/testing/chromium/chromium-uclibc-resolv.patch index 736b520a1..decc14bc9 100644 --- a/testing/chromium/chromium-uclibc-resolv.patch +++ b/testing/chromium/chromium-uclibc-resolv.patch @@ -1,35 +1,88 @@ ---- chromium-13.0.754.0.orig/net/base/dnsrr_resolver.cc -+++ chromium-13.0.754.0/net/base/dnsrr_resolver.cc -@@ -185,16 +185,20 @@ +--- chromium-17.0.942.0.orig/net/base/dnsrr_resolver.cc ++++ chromium-17.0.942.0/net/base/dnsrr_resolver.cc +@@ -187,7 +187,7 @@ } bool r = true; -+#if defined(OS_POSIX) && !defined(__UCLIBC__) +-#if defined(OS_MACOSX) || defined(OS_OPENBSD) ++#if !defined(__UCLIBC__) && (defined(OS_MACOSX) || defined(OS_OPENBSD)) if ((_res.options & RES_INIT) == 0) { - if (res_ninit(&_res) != 0) - r = false; - } -+#else -+ r = true; -+#endif + #if defined(OS_OPENBSD) + if (res_init() != 0) +--- chromium-17.0.942.0.orig/net/base/host_resolver_proc.cc ++++ chromium-17.0.942.0/net/base/host_resolver_proc.cc +@@ -184,7 +184,7 @@ + hints.ai_socktype = SOCK_STREAM; + + #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \ +- !defined(OS_ANDROID) ++ !defined(OS_ANDROID) && !defined(__UCLIBC__) + DnsReloaderMaybeReload(); + #endif + int err = getaddrinfo(host.c_str(), NULL, &hints, &ai); +--- chromium-17.0.942.0.orig/net/base/dns_reloader.cc ++++ chromium-17.0.942.0/net/base/dns_reloader.cc +@@ -4,7 +4,7 @@ - if (r) { - unsigned long saved_options = _res.options; - r = Do(); + #include "net/base/dns_reloader.h" -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && !defined(__UCLIBC__) - if (!r && DnsReloadTimerHasExpired()) { - // When there's no network connection, _res may not be initialized by - // getaddrinfo. Therefore, we call res_nclose only when there are ns ---- chromium-13.0.754.0.orig/net/base/host_resolver_proc.cc -+++ chromium-13.0.754.0/net/base/host_resolver_proc.cc -@@ -198,7 +198,7 @@ ++#if 0 - int err = getaddrinfo(host.c_str(), NULL, &hints, &ai); - bool should_retry = false; + #include <resolv.h> + +--- chromium-17.0.942.0.orig/net/base/dnsrr_resolver.cc ++++ chromium-17.0.942.0/net/base/dnsrr_resolver.cc +@@ -187,9 +187,9 @@ + } + + bool r = true; +-#if !defined(__UCLIBC__) && (defined(OS_MACOSX) || defined(OS_OPENBSD)) ++#if defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(__UCLIBC__) + if ((_res.options & RES_INIT) == 0) { +-#if defined(OS_OPENBSD) ++#if defined(OS_OPENBSD) || defined(__UCLIBC__) + if (res_init() != 0) + #else + if (res_ninit(&_res) != 0) +--- chromium-17.0.942.0.orig/net/dns/dns_config_service_posix.cc ++++ chromium-17.0.942.0/net/dns/dns_config_service_posix.cc +@@ -30,7 +30,7 @@ + success_(false) {} + + void DoWork() OVERRIDE { +-#if defined(OS_OPENBSD) ++#if defined(OS_OPENBSD) || defined(__UCLIBC__) + if ((res_init() == 0) && (_res.options & RES_INIT)) { + success_ = ConvertResToConfig(_res, &dns_config_); + #else +@@ -45,7 +45,7 @@ + } + #if defined(OS_MACOSX) + res_ndestroy(&res); +-#elif !defined(OS_OPENBSD) ++#elif !defined(OS_OPENBSD) && !defined(__UCLIBC__) + res_nclose(&res); + #endif + } +@@ -132,7 +132,9 @@ + #if defined(RES_ROTATE) + dns_config->rotate = res.options & RES_ROTATE; + #endif ++#if defined(RES_USE_EDNS0) + dns_config->edns0 = res.options & RES_USE_EDNS0; ++#endif + + return true; + } +--- chromium-17.0.942.0.orig/net/base/host_resolver_impl.cc ++++ chromium-17.0.942.0/net/base/host_resolver_impl.cc +@@ -1081,7 +1081,7 @@ + additional_resolver_flags_ |= HOST_RESOLVER_LOOPBACK_ONLY; + #endif + NetworkChangeNotifier::AddIPAddressObserver(this); -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && !defined(__UCLIBC__) - // If we fail, re-initialise the resolver just in case there have been any - // changes to /etc/resolv.conf and retry. See http://crbug.com/11380 for info. - if (err && DnsReloadTimerHasExpired()) { + EnsureDnsReloaderInit(); + NetworkChangeNotifier::AddDNSObserver(this); + #endif |