From 6e6b85debee3db573ab55df09ae78a6c199d7d16 Mon Sep 17 00:00:00 2001 From: HyTurtle <81598434+HyTurtle@users.noreply.github.com> Date: Wed, 20 Nov 2024 15:22:53 +0000 Subject: [PATCH 1/2] bump openssl to 3 As version 1.1 disabled --- pythonforandroid/prerequisites.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pythonforandroid/prerequisites.py b/pythonforandroid/prerequisites.py index e85991948f..6b592046ed 100644 --- a/pythonforandroid/prerequisites.py +++ b/pythonforandroid/prerequisites.py @@ -262,7 +262,7 @@ def darwin_installer(self): class OpenSSLPrerequisite(Prerequisite): name = "openssl" - homebrew_formula_name = "openssl@1.1" + homebrew_formula_name = "openssl@3" mandatory = dict(linux=False, darwin=True) installer_is_supported = dict(linux=False, darwin=True) From 411a569255d7c3de14dd37e7767707cd39544ba4 Mon Sep 17 00:00:00 2001 From: HyTurtle <81598434+HyTurtle@users.noreply.github.com> Date: Tue, 26 Nov 2024 15:58:27 +0000 Subject: [PATCH 2/2] Update test_prerequisites.py bump test version of openssl to 3 --- tests/test_prerequisites.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_prerequisites.py b/tests/test_prerequisites.py index 70ffa0c0d1..8d577fde1c 100644 --- a/tests/test_prerequisites.py +++ b/tests/test_prerequisites.py @@ -99,8 +99,8 @@ def setUp(self): self.mandatory = dict(linux=False, darwin=True) self.installer_is_supported = dict(linux=False, darwin=True) self.prerequisite = OpenSSLPrerequisite() - self.expected_homebrew_formula_name = "openssl@1.1" - self.expected_homebrew_location_prefix = "/opt/homebrew/opt/openssl@1.1" + self.expected_homebrew_formula_name = "openssl@3" + self.expected_homebrew_location_prefix = "/opt/homebrew/opt/openssl@3" @mock.patch( "pythonforandroid.prerequisites.Prerequisite._darwin_get_brew_formula_location_prefix"