(arrow) branch main updated: GH-42232: [C++] Use non-stale c-ares download URL (#42250)

[kou]

This is an automated email from the ASF dual-hosted git repository.

kou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/main by this push:
     new 3fe4df3657 GH-42232: [C++] Use non-stale c-ares download URL (#42250)
3fe4df3657 is described below

commit 3fe4df365791770638b8655006785a4e0f75417e
Author: Jonathan Keane <jke...@gmail.com>
AuthorDate: Sat Jun 22 18:46:40 2024 -0500

    GH-42232: [C++] Use non-stale c-ares download URL (#42250)
    
    ### Rationale for this change
    
    The URL to download the c-ares dependency is stale. Note: we weren't seeing 
this bonk on most CI because we have the fallback of our own copy of these. But 
the R script that downloads all of our thirdparty deps always uses the official 
URL which is the one that had moved.
    
    Resolves #42232
    
    ### What changes are included in this PR?
    
    Use the appropriate URL, muck with `.` -> `_`
    
    ### Are these changes tested?
    
    The current CI should pass + the R maximal offline build should pass too
    
    ### Are there any user-facing changes?
    
    More reliable retrieval of all thirdparty dependencies
    * GitHub Issue: #42232
    
    Authored-by: Jonathan Keane <jke...@gmail.com>
    Signed-off-by: Sutou Kouhei <k...@clear-code.com>
---
 cpp/cmake_modules/ThirdpartyToolchain.cmake | 4 +++-
 cpp/thirdparty/versions.txt                 | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake 
b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 9dcb426f07..fe859a0121 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -634,8 +634,10 @@ endif()
 if(DEFINED ENV{ARROW_CARES_URL})
   set(CARES_SOURCE_URL "$ENV{ARROW_CARES_URL}")
 else()
+  string(REPLACE "." "_" ARROW_CARES_BUILD_VERSION_UNDERSCORES
+                 ${ARROW_CARES_BUILD_VERSION})
   set_urls(CARES_SOURCE_URL
-           
"https://c-ares.haxx.se/download/c-ares-${ARROW_CARES_BUILD_VERSION}.tar.gz";
+           
"https://github.com/c-ares/c-ares/releases/download/cares-${ARROW_CARES_BUILD_VERSION_UNDERSCORES}/c-ares-${ARROW_CARES_BUILD_VERSION}.tar.gz";
            
"${THIRDPARTY_MIRROR_URL}/cares-${ARROW_CARES_BUILD_VERSION}.tar.gz")
 endif()
 
diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt
index 67275ffea5..f080cf58bc 100644
--- a/cpp/thirdparty/versions.txt
+++ b/cpp/thirdparty/versions.txt
@@ -144,7 +144,7 @@ DEPENDENCIES=(
   "ARROW_BOOST_URL boost-${ARROW_BOOST_BUILD_VERSION}.tar.gz 
https://apache.jfrog.io/artifactory/arrow/thirdparty/7.0.0/boost_${ARROW_BOOST_BUILD_VERSION//./_}.tar.gz";
   "ARROW_BROTLI_URL brotli-${ARROW_BROTLI_BUILD_VERSION}.tar.gz 
https://github.com/google/brotli/archive/${ARROW_BROTLI_BUILD_VERSION}.tar.gz";
   "ARROW_BZIP2_URL bzip2-${ARROW_BZIP2_BUILD_VERSION}.tar.gz 
https://sourceware.org/pub/bzip2/bzip2-${ARROW_BZIP2_BUILD_VERSION}.tar.gz";
-  "ARROW_CARES_URL cares-${ARROW_CARES_BUILD_VERSION}.tar.gz 
https://c-ares.haxx.se/download/c-ares-${ARROW_CARES_BUILD_VERSION}.tar.gz";
+  "ARROW_CARES_URL cares-${ARROW_CARES_BUILD_VERSION}.tar.gz 
https://github.com/c-ares/c-ares/releases/download/cares-${ARROW_CARES_BUILD_VERSION//./_}/c-ares-${ARROW_CARES_BUILD_VERSION}.tar.gz";
   "ARROW_CRC32C_URL crc32c-${ARROW_CRC32C_BUILD_VERSION}.tar.gz 
https://github.com/google/crc32c/archive/refs/tags/${ARROW_CRC32C_BUILD_VERSION}.tar.gz";
   "ARROW_GBENCHMARK_URL gbenchmark-${ARROW_GBENCHMARK_BUILD_VERSION}.tar.gz 
https://github.com/google/benchmark/archive/${ARROW_GBENCHMARK_BUILD_VERSION}.tar.gz";
   "ARROW_GFLAGS_URL gflags-${ARROW_GFLAGS_BUILD_VERSION}.tar.gz 
https://github.com/gflags/gflags/archive/${ARROW_GFLAGS_BUILD_VERSION}.tar.gz";