From 9187a0810620a597ff1e583f55f47be4de387e96 Mon Sep 17 00:00:00 2001 From: Max Kellermann <max@musicpd.org> Date: Fri, 9 Feb 2018 23:07:49 +0100 Subject: [PATCH] lib/curl: remove .netrc support on Android Not needed on Android, and the implementation uses getpwuid_r() which is unavailable on old Android versions. --- src/lib/curl/patches/no_netrc.patch | 20 ++++++++++++++++++++ src/lib/curl/patches/series | 1 + 2 files changed, 21 insertions(+) create mode 100644 src/lib/curl/patches/no_netrc.patch diff --git a/src/lib/curl/patches/no_netrc.patch b/src/lib/curl/patches/no_netrc.patch new file mode 100644 index 000000000..22557d162 --- /dev/null +++ b/src/lib/curl/patches/no_netrc.patch @@ -0,0 +1,20 @@ +Index: curl-7.58.0/lib/url.c +=================================================================== +--- curl-7.58.0.orig/lib/url.c ++++ curl-7.58.0/lib/url.c +@@ -3503,6 +3503,7 @@ static CURLcode override_login(struct Cu + } + + conn->bits.netrc = FALSE; ++#ifndef __BIONIC__ + if(data->set.use_netrc != CURL_NETRC_IGNORED) { + int ret = Curl_parsenetrc(conn->host.name, + userp, passwdp, +@@ -3524,6 +3525,7 @@ static CURLcode override_login(struct Cu + conn->bits.user_passwd = TRUE; /* enable user+password */ + } + } ++#endif + + return CURLE_OK; + } diff --git a/src/lib/curl/patches/series b/src/lib/curl/patches/series index 5d0e89439..f9bd7bfe3 100644 --- a/src/lib/curl/patches/series +++ b/src/lib/curl/patches/series @@ -1 +1,2 @@ only_lib.patch +no_netrc.patch