build: stop adding unnecessary libraries (#731)

Do not install libraries marked as keg-only in Homebrew [1].

[1] which means it is not symlinked into /usr/local because macOS
    already provides this software. Installing another version in
    parallel can cause conflicts and other issues.

See: #723.

Signed-off-by: Claudio André <[email protected]>

deploy/Mac_ARM-Delivery.yml

@@ -8,7 +8,7 @@
 #                                                       | |   | |
 #                                                       |_|   |_|
 #
-# Copyright (c) 2023-2024 Claudio André <dev at claudioandre.slmail.me>
+# Copyright (c) 2023-2025 Claudio André <dev at claudioandre.slmail.me>
 #
 # This program comes with ABSOLUTELY NO WARRANTY; express or implied.
 #
@@ -58,6 +58,15 @@ macOS_task:
     .ci/ci_controller.sh "$TARGET_ARCH" TEST
 
   package_script: |
+    otool -L run/john
+    if false; then
+      # Add the necessary Homebrew libraries to the final package
+      cp "/opt/homebrew/opt/libomp/lib/libomp.dylib"          run/
+      cp "/opt/homebrew/opt/openssl@3/lib/libssl.3.dylib"     run/
+      cp "/opt/homebrew/opt/openssl@3/lib/libcrypto.3.dylib"  run/
+      cp "/opt/homebrew/opt/gmp/lib/libgmp.10.dylib"          run/
+    fi
+
     wget https://raw.githubusercontent.com/openwall/john-packages/main/scripts/clean_package.sh \
       -O .ci/clean_package.sh
     source .ci/clean_package.sh

requirements.hash

@@ -1,4 +1,4 @@
-8eaf3bbf120f883f688e100b9329ce9629a78f2c775239d7483efd937240f942  ./ci_controller.sh
+3d10ec86d6253bdf899bbd7aa1c1f43533c3588dd2acd276301c68d6e70c0409  ./ci_controller.sh
 e25fca925ee687bc46f5be6487c48ee977b697d05df97ccaca86d36ee8d213dc  ./clean_package.sh
 829470da958b5afce3b2023d66eeac9b41d493e9ad8c20fca25109e156312cf0  ./helper.sh
 75de2f0f7c4c02dd16baab447492de281e90e8413f276f86d6a5faeec9dc9025  ./merge_procedures.sh

scripts/ci_controller.sh

@@ -10,7 +10,7 @@
 #                                                       | |   | |
 #                                                       |_|   |_|
 #
-# Copyright (c) 2019-2024 Claudio André <dev at claudioandre.slmail.me>
+# Copyright (c) 2019-2025 Claudio André <dev at claudioandre.slmail.me>
 #
 # This program comes with ABSOLUTELY NO WARRANTY; express or implied.
 #
@@ -45,7 +45,7 @@ fi
 
 if [[ "$TARGET_ARCH" == *"macOS"* && $2 == "INFO" ]]; then
 	brew update
-	brew install openssl libpcap libomp gmp coreutils p7zip
+	brew install gmp coreutils p7zip
 fi
 
 # Download the required and missing file
@@ -88,10 +88,6 @@ if [[ "$2" == "BUILD" ]]; then
 		CFLAGS_gmp="-I/$MAC_LOCAL_PATH/gmp/include"
 		CFLAGS_omp="-I/$MAC_LOCAL_PATH/libomp/include"
 
-		if [[ $TARGET_ARCH == *"macOS ARM"* ]]; then
-			brew link openssl --force
-		fi
-
 		if [[ $TARGET_ARCH == *"macOS X86"* ]]; then
 			do_configure "$NO_OPENMP" --enable-simd=avx && do_build ../run/john-avx
 			do_configure "$REGULAR" --enable-simd=avx LDFLAGS="$LDFLAGS_omp" CPPFLAGS="-Xclang -fopenmp $CFLAGS_omp -DOMP_FALLBACK_BINARY=\"\\\"john-avx\\\"\" " && do_build ../run/john-avx-omp