diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-08-08 13:34:16 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-09-15 13:37:11 +0000 |
| commit | d183e852a762296b473c33e9ce106f52a4359dae (patch) | |
| tree | 2f92f891d7ff1fc4b4aa0551bd7b28218b30b9d3 /community/chromium/resolver.patch | |
| parent | 0d4667363c89e53a83538d90acdc612739d061db (diff) | |
| download | aports-d183e852a762296b473c33e9ce106f52a4359dae.tar.bz2 aports-d183e852a762296b473c33e9ce106f52a4359dae.tar.xz | |
community/chromium: upgrade to 61.0.3163.79
to fix tab crashes, use patch from
https://github.com/lluixhi/musl-extras/issues/10#issuecomment-328272349
use various patches from fedora
Diffstat (limited to 'community/chromium/resolver.patch')
| -rw-r--r-- | community/chromium/resolver.patch | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/community/chromium/resolver.patch b/community/chromium/resolver.patch index 7e2a0a4723..bde36ce1a5 100644 --- a/community/chromium/resolver.patch +++ b/community/chromium/resolver.patch @@ -1,27 +1,15 @@ --- ./net/dns/host_resolver_impl.cc.orig +++ ./net/dns/host_resolver_impl.cc -@@ -1881,8 +1881,7 @@ - #endif +@@ -2039,8 +2039,7 @@ NetworkChangeNotifier::AddIPAddressObserver(this); + NetworkChangeNotifier::AddConnectionTypeObserver(this); NetworkChangeNotifier::AddDNSObserver(this); -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \ -- !defined(OS_ANDROID) -+#if defined(__GLIBC__) +- !defined(OS_ANDROID) && !defined(OS_FUCHSIA) ++#if defined(__GLIBC__) EnsureDnsReloaderInit(); #endif ---- ./net/dns/host_resolver_proc.cc.orig -+++ ./net/dns/host_resolver_proc.cc -@@ -193,8 +193,7 @@ - // Restrict result set to only this socket type to avoid duplicates. - hints.ai_socktype = SOCK_STREAM; - --#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \ -- !defined(OS_ANDROID) -+#if defined(__GLIBC__) - DnsReloaderMaybeReload(); - #endif - int err = getaddrinfo(host.c_str(), NULL, &hints, &ai); --- ./net/dns/dns_reloader.cc.orig +++ ./net/dns/dns_reloader.cc @@ -4,8 +4,7 @@ @@ -29,8 +17,20 @@ #include "net/dns/dns_reloader.h" -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \ -- !defined(OS_ANDROID) +- !defined(OS_ANDROID) && !defined(OS_FUCHSIA) +#if defined(__GLIBC__) #include <resolv.h> +--- ./net/dns/host_resolver_proc.cc.orig ++++ ./net/dns/host_resolver_proc.cc +@@ -190,8 +190,7 @@ + // Restrict result set to only this socket type to avoid duplicates. + hints.ai_socktype = SOCK_STREAM; + +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \ +- !defined(OS_ANDROID) && !defined(OS_FUCHSIA) ++#if defined(__GLIBC__) + DnsReloaderMaybeReload(); + #endif + int err = getaddrinfo(host.c_str(), NULL, &hints, &ai); |