c-ares: update to 1.17.1

packages/c-ares/build.sh

@@ -1,10 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://c-ares.haxx.se
 TERMUX_PKG_DESCRIPTION="Library for asynchronous DNS requests (including name resolves)"
 TERMUX_PKG_LICENSE="MIT"
-TERMUX_PKG_VERSION=1.16.1
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=1.17.1
 TERMUX_PKG_SRCURL=https://github.com/c-ares/c-ares/archive/cares-${TERMUX_PKG_VERSION//./_}.tar.gz
-TERMUX_PKG_SHA256=870962cc8f6b352303c404ce848e2ea1f1072f3c0a940042209a72179511c08c
+TERMUX_PKG_SHA256=61f7cf09605f5e38d4828f82d0e2ddb9de8e355ecfd6819b740691c644583b8f
 TERMUX_PKG_BREAKS="c-ares-dev"
 TERMUX_PKG_REPLACES="c-ares-dev"
 # Build with cmake to install cmake/c-ares/*.cmake files:

packages/c-ares/disable-ares-android.patch

@@ -1,6 +1,6 @@
-diff -u -r ../c-ares-cares-1_15_0/ares_android.c ./ares_android.c
---- ../c-ares-cares-1_15_0/ares_android.c	2018-10-23 13:49:22.000000000 +0000
-+++ ./ares_android.c	2018-11-01 02:26:38.968483738 +0000
+diff -u -r ../lib.orig/ares_android.c ./src/lib/ares_android.c
+--- ../lib.orig/ares_android.c	2020-11-21 20:32:59.251385702 +0000
++++ ./src/lib/ares_android.c	2020-11-21 20:35:18.415669550 +0000
 @@ -12,7 +12,7 @@
   * this software for any purpose.  It is provided "as is"
   * without express or implied warranty.
@@ -10,9 +10,9 @@ diff -u -r ../c-ares-cares-1_15_0/ares_android.c ./ares_android.c
  
  #include <jni.h>
  
-diff -u -r ../c-ares-cares-1_15_0/ares_init.c ./ares_init.c
---- ../c-ares-cares-1_15_0/ares_init.c	2018-10-23 13:49:22.000000000 +0000
-+++ ./ares_init.c	2018-11-01 02:29:03.106824681 +0000
+diff -u -r ../lib.orig/ares_init.c ./src/lib/ares_init.c
+--- ../lib.orig/ares_init.c	2020-11-21 20:32:59.251385702 +0000
++++ ./src/lib/ares_init.c	2020-11-21 20:36:36.116251854 +0000
 @@ -44,7 +44,6 @@
  
  #if defined(ANDROID) || defined(__ANDROID__)
@@ -21,7 +21,7 @@ diff -u -r ../c-ares-cares-1_15_0/ares_init.c ./ares_init.c
  /* From the Bionic sources */
  #define DNS_PROP_NAME_PREFIX  "net.dns"
  #define MAX_DNS_PROPERTIES    8
-@@ -1549,35 +1548,6 @@
+@@ -1533,35 +1532,6 @@
    char *domains;
    size_t num_servers;
  
@@ -57,9 +57,9 @@ diff -u -r ../c-ares-cares-1_15_0/ares_init.c ./ares_init.c
  #  ifdef HAVE___SYSTEM_PROPERTY_GET
    /* Old way using the system property still in place as
     * a fallback. Older android versions can still use this.
-diff -u -r ../c-ares-cares-1_15_0/ares_library_init.c ./ares_library_init.c
---- ../c-ares-cares-1_15_0/ares_library_init.c	2018-10-23 13:49:22.000000000 +0000
-+++ ./ares_library_init.c	2018-11-01 02:26:38.972483691 +0000
+diff -u -r ../lib.orig/ares_library_init.c ./src/lib/ares_library_init.c
+--- ../lib.orig/ares_library_init.c	2020-11-21 20:32:59.251385702 +0000
++++ ./src/lib/ares_library_init.c	2020-11-21 20:37:15.703215185 +0000
 @@ -30,10 +30,6 @@
  fpGetBestRoute2_t ares_fpGetBestRoute2 = ZERO_NULL;
  #endif

packages/c-ares/fix-path-etc-hosts.patch

@@ -1,7 +1,6 @@
-diff -uNr c-ares-1.13.0/ares_private.h c-ares-1.13.0.mod/ares_private.h
---- c-ares-1.13.0/ares_private.h	2017-06-16 15:53:03.000000000 +0300
-+++ c-ares-1.13.0.mod/ares_private.h	2017-09-12 11:24:17.332992105 +0300
-@@ -84,7 +84,7 @@
+--- ./src/lib/ares_private.h.orig	2020-11-21 21:43:33.056110585 +0100
++++ ./src/lib/ares_private.h	2020-11-21 21:45:49.140561610 +0100
+@@ -91,7 +91,7 @@
  #ifdef ETC_INET
  #define PATH_HOSTS              "/etc/inet/hosts"
  #else

packages/c-ares/hardcode-fallback-dns.patch

@@ -1,7 +1,6 @@
-diff -uNr c-ares-cares-1_16_0/ares_init.c c-ares-cares-1_16_0.mod/ares_init.c
---- c-ares-cares-1_16_0/ares_init.c	2020-03-12 18:58:05.000000000 +0200
-+++ c-ares-cares-1_16_0.mod/ares_init.c	2020-04-10 21:00:59.756808053 +0300
-@@ -1585,20 +1585,8 @@
+--- ./src/lib/ares_init.c.orig	2020-11-21 21:53:22.660574509 +0100
++++ ./src/lib/ares_init.c	2020-11-21 21:53:35.487337300 +0100
+@@ -1541,20 +1541,8 @@
     * We'll only run this if we don't have any dns servers
     * because this will get the same ones (if it works). */
    if (status != ARES_EOF) {