diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-05-06 06:00:51 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-08-07 14:40:55 +0000 |
| commit | 5f276606f194b9b107043dda8d8479a9842f13cb (patch) | |
| tree | 74189c769c729326ddd8578aee0890aa377422da /community/chromium/resolver.patch | |
| parent | ec982866ada0790335f5550608772b72f71e69a8 (diff) | |
| download | aports-5f276606f194b9b107043dda8d8479a9842f13cb.tar.bz2 aports-5f276606f194b9b107043dda8d8479a9842f13cb.tar.xz | |
community/chromium: upgrade to 76
disabel armhf and armv7 til we sorted out the clang++ problem
Diffstat (limited to 'community/chromium/resolver.patch')
| -rw-r--r-- | community/chromium/resolver.patch | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/community/chromium/resolver.patch b/community/chromium/resolver.patch index 8664aaf376..da9028f6c7 100644 --- a/community/chromium/resolver.patch +++ b/community/chromium/resolver.patch @@ -1,4 +1,6 @@ ---- ./net/dns/dns_reloader.cc.orig +diff --git a/net/dns/dns_reloader.cc b/net/dns/dns_reloader.cc +index 03e248c..1a7b237 100644 +--- ./net/dns/dns_reloader.cc +++ ./net/dns/dns_reloader.cc @@ -4,8 +4,7 @@ @@ -10,23 +12,11 @@ #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); -diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc -index bdf16b8..b234edd 100644 ---- ./net/dns/host_resolver_impl.cc -+++ ./net/dns/host_resolver_impl.cc -@@ -2018,8 +2018,7 @@ HostResolverImpl::HostResolverImpl(const Options& options, NetLog* net_log) +diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc +index 3c75dde..c748d94 100644 +--- ./net/dns/host_resolver_manager.cc ++++ ./net/dns/host_resolver_manager.cc +@@ -2266,8 +2266,7 @@ HostResolverManager::HostResolverManager(const Options& options, NetworkChangeNotifier::AddIPAddressObserver(this); NetworkChangeNotifier::AddConnectionTypeObserver(this); NetworkChangeNotifier::AddDNSObserver(this); @@ -36,3 +26,17 @@ index bdf16b8..b234edd 100644 EnsureDnsReloaderInit(); #endif +diff --git a/net/dns/host_resolver_proc.cc b/net/dns/host_resolver_proc.cc +index 90d9958..71d9b4a 100644 +--- ./net/dns/host_resolver_proc.cc ++++ ./net/dns/host_resolver_proc.cc +@@ -197,8 +197,7 @@ int SystemHostResolverCall(const std::string& host, + base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, + base::BlockingType::WILL_BLOCK); + +-#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(), nullptr, &hints, &ai); |