From: Joel Rosdahl <joel@rosdahl.net>
Date: Mon, 30 Jan 2023 20:23:43 +0000 (+0100)
Subject: build: Fix Zstd and Hiredis downloads for unstable GitHub archives
X-Git-Tag: v4.8~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4d3b9a9033b517ff3a6739144ae70858cab8143;p=thirdparty%2Fccache.git

build: Fix Zstd and Hiredis downloads for unstable GitHub archives

The content of the Zstd and Hiredis GitHub source achive URLs like
<https://github.com/$X/$Y/archive/$tag.tar.gz> apparently change from
time to time. Color me surprised. [1] says that this is intentional
(although, at the time of writing, reverted temporarily). Let's use
another URL for Zstd and not verify the checksum for Hiredis (since
there is no release source archive).

[1]: https://github.blog/changelog/2023-01-30-git-archive-checksums-may-change/
---

diff --git a/cmake/Findhiredis.cmake b/cmake/Findhiredis.cmake
index b52cb1d8f..8c01058c2 100644
--- a/cmake/Findhiredis.cmake
+++ b/cmake/Findhiredis.cmake
@@ -57,8 +57,7 @@ if(do_download)
   include(FetchContent)
   FetchContent_Declare(
     hiredis
-    URL https://github.com/redis/hiredis/archive/v${hiredis_version}.tar.gz
-    URL_HASH SHA256=fe6d21741ec7f3fc9df409d921f47dfc73a4d8ff64f4ac6f1d95f951bf7f53d6
+    URL https://github.com/redis/hiredis/archive/refs/tags/v${hiredis_version}.tar.gz
     SOURCE_DIR ${hiredis_dir}
     BINARY_DIR ${hiredis_build}
   )
diff --git a/cmake/Findzstd.cmake b/cmake/Findzstd.cmake
index 3c770a9e0..b68db6ab9 100644
--- a/cmake/Findzstd.cmake
+++ b/cmake/Findzstd.cmake
@@ -55,8 +55,8 @@ if(do_download)
   include(FetchContent)
   FetchContent_Declare(
     zstd
-    URL https://github.com/facebook/zstd/archive/v${zstd_version}.tar.gz
-    URL_HASH SHA256=f7de13462f7a82c29ab865820149e778cbfe01087b3a55b5332707abf9db4a6e
+    URL https://github.com/facebook/zstd/releases/download/v${zstd_version}/zstd-${zstd_version}.tar.gz
+    URL_HASH SHA256=7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0
     SOURCE_DIR ${zstd_dir}
     BINARY_DIR ${zstd_build}
   )