From b65352ee8e2527eefa470957f7945ea7c4dcde5a Mon Sep 17 00:00:00 2001 From: Arian Izadi <15961653+arianizadi@users.noreply.github.com> Date: Wed, 27 Nov 2024 17:47:06 -0800 Subject: [PATCH 1/4] [fix] follow redirects for openssl download --- daemon/References/macOS/scripts/build-openvpn.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/References/macOS/scripts/build-openvpn.sh b/daemon/References/macOS/scripts/build-openvpn.sh index d761f3d9..18099b2d 100755 --- a/daemon/References/macOS/scripts/build-openvpn.sh +++ b/daemon/References/macOS/scripts/build-openvpn.sh @@ -40,7 +40,7 @@ echo "************************************************" echo "******** Downloading OpenSSL sources..." echo "************************************************" cd ${BUILD_DIR} -curl https://www.openssl.org/source/openssl-${OPEN_SSL_VER}.tar.gz | tar zx +curl -L https://www.openssl.org/source/openssl-${OPEN_SSL_VER}.tar.gz | tar zx # ############################################################################## # Compilation OpenSSl info: From fa98d8798d915cf1fcfb78445eded04b6cec8b9c Mon Sep 17 00:00:00 2001 From: Arian Izadi <15961653+arianizadi@users.noreply.github.com> Date: Wed, 27 Nov 2024 17:54:24 -0800 Subject: [PATCH 2/4] [fix] remove patch causing errors in newer macos --- .../References/macOS/scripts/build-openvpn.sh | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/daemon/References/macOS/scripts/build-openvpn.sh b/daemon/References/macOS/scripts/build-openvpn.sh index 18099b2d..8238c430 100755 --- a/daemon/References/macOS/scripts/build-openvpn.sh +++ b/daemon/References/macOS/scripts/build-openvpn.sh @@ -62,7 +62,7 @@ fi echo "************************************************" echo "******** Compiling OpenSSL..." echo "************************************************" -make +make -j $(sysctl -n hw.logicalcpu) echo "************************************************" echo "******** Copying OpenSSL include folder and static libraries..." @@ -84,7 +84,7 @@ cd lzo-${LZO_VER} echo "************************************************" echo "******** Compiling LZO..." echo "************************************************" -CLFAGS="-mmacosx-version-min=10.6" ./configure --prefix="${INSTALL_DIR}" && make && make install +./configure --prefix="${INSTALL_DIR}" && make -j $(sysctl -n hw.logicalcpu) && make install echo "************************************************" echo "******** Cloning OpenVPN sources..." @@ -98,10 +98,11 @@ echo "******** Checkout OpenVPN version (${OPEN_VPN_VER})..." echo "************************************************" git checkout ${OPEN_VPN_VER} -echo "************************************************" -echo "******** Patching OpenVPN..." -echo "************************************************" -patch -p2 < $BASE_DIR/patches/openvpn-osx-lion.patch +# echo "************************************************" +# echo "******** Patching OpenVPN..." +# echo "************************************************" +# patch -p2 < $BASE_DIR/patches/openvpn-osx-lion.patch +# ! Patching causes error on macOS 15.2 Beta (24C5089c) echo "************************************************" echo "******** OpenVPN: Updating generated configuration files..." @@ -111,16 +112,20 @@ autoreconf -ivf echo "************************************************" echo "******** Configuring OpenVPN..." echo "************************************************" -CFLAGS="-mmacosx-version-min=10.6 -I${INSTALL_DIR}/include" \ - LDFLAGS="-L${INSTALL_DIR}/lib" \ - ./configure --disable-debug --disable-server --enable-password-save \ - --disable-lz4 +OPENSSL_LIBS="-L${INSTALL_DIR}/lib -lssl -lcrypto" \ +OPENSSL_CFLAGS="-I${INSTALL_DIR}/include" \ +CFLAGS="-I${INSTALL_DIR}/include" \ +LDFLAGS="-L${INSTALL_DIR}/lib" \ +./configure --disable-debug \ + --disable-server \ + --enable-password-save \ + # --disable-lz4 \ # disabling lz4 compression algorithm (there is compilation error on macOS M1 when LZ4 enabled) echo "************************************************" echo "******** Compiling OpenVPN..." echo "************************************************" -make +make -j $(sysctl -n hw.logicalcpu) echo "********************************" echo "******** BUILD COMPLETE ********" From b20282e133d9822b62edbaecee0a7359967de32e Mon Sep 17 00:00:00 2001 From: Arian Izadi <15961653+arianizadi@users.noreply.github.com> Date: Wed, 27 Nov 2024 17:55:04 -0800 Subject: [PATCH 3/4] [fix] updated go version specification macos --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index c68c9b0e..857e17c7 100644 --- a/readme.md +++ b/readme.md @@ -60,7 +60,7 @@ These instructions enable you to get the project up and running on your local ma #### macOS -[Go 1.21+](https://golang.org/); Git; [npm](https://www.npmjs.com/get-npm); [Node.js (18)](https://nodejs.org/); Xcode Command Line Tools. +[Go 1.21-1.22.9](https://golang.org/); Git; [npm](https://www.npmjs.com/get-npm); [Node.js (18)](https://nodejs.org/); Xcode Command Line Tools. To compile the OpenVPN/OpenSSL binaries locally, additional packages are required: ```bash brew install autoconf automake libtool From 6436280e469cff8c20ab429bb73e054eb2ac8549 Mon Sep 17 00:00:00 2001 From: Arian Izadi <15961653+arianizadi@users.noreply.github.com> Date: Thu, 28 Nov 2024 00:32:19 -0800 Subject: [PATCH 4/4] Updated Author --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 3ce229f9..89b04bae 100644 --- a/AUTHORS +++ b/AUTHORS @@ -7,6 +7,7 @@ # Individual Persons Alexandr Stelnykovych +Arian Izadi # Organizations