From 41dfc53c3183361dedb96eba56e154c276b51250 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 16 Aug 2024 09:30:34 +0200
Subject: [PATCH] [bzip2] Fix build wrt Android NDK and CMake (#40348)

---
 ports/bzip2/CMakeLists.txt | 2 +-
 ports/bzip2/portfile.cmake | 1 +
 ports/bzip2/vcpkg.json     | 2 +-
 versions/b-/bzip2.json     | 5 +++++
 versions/baseline.json     | 2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ports/bzip2/CMakeLists.txt b/ports/bzip2/CMakeLists.txt
index d0f200a0a6..95e269ab85 100644
--- a/ports/bzip2/CMakeLists.txt
+++ b/ports/bzip2/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5...3.29)
 project(bzip2 C)
 
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
diff --git a/ports/bzip2/portfile.cmake b/ports/bzip2/portfile.cmake
index 4c99680313..d91aac67a2 100644
--- a/ports/bzip2/portfile.cmake
+++ b/ports/bzip2/portfile.cmake
@@ -1,5 +1,6 @@
 vcpkg_download_distfile(ARCHIVE
     URLS "https://sourceware.org/pub/bzip2/bzip2-${VERSION}.tar.gz"
+         "https://www.mirrorservice.org/sites/sourceware.org/pub/bzip2/bzip2-${VERSION}.tar.gz"
     FILENAME "bzip2-${VERSION}.tar.gz"
     SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
 )
diff --git a/ports/bzip2/vcpkg.json b/ports/bzip2/vcpkg.json
index 4a609b29a2..1663999c5d 100644
--- a/ports/bzip2/vcpkg.json
+++ b/ports/bzip2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "bzip2",
   "version-semver": "1.0.8",
-  "port-version": 5,
+  "port-version": 6,
   "description": "bzip2 is a freely available, patent free, high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression.",
   "homepage": "https://sourceware.org/bzip2/",
   "documentation": "https://sourceware.org/bzip2/docs.html",
diff --git a/versions/b-/bzip2.json b/versions/b-/bzip2.json
index 1d7e2b0473..2e34a97fb1 100644
--- a/versions/b-/bzip2.json
+++ b/versions/b-/bzip2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2d029da682847c5ebdc54e4dbea001331a02207e",
+      "version-semver": "1.0.8",
+      "port-version": 6
+    },
     {
       "git-tree": "92e9a8bbf1abbd89872b48ad82fcf75852de1006",
       "version-semver": "1.0.8",
diff --git a/versions/baseline.json b/versions/baseline.json
index 3922410b7d..0e42895246 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1430,7 +1430,7 @@
     },
     "bzip2": {
       "baseline": "1.0.8",
-      "port-version": 5
+      "port-version": 6
     },
     "c-ares": {
       "baseline": "1.33.0",