Skip to content

cURL update / openssl #538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danoli3 merged 23 commits into from
Jul 18, 2025
Merged

cURL update / openssl #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
401442b
OpenSSL - build2 allow some older functions like MD2, RC5, Older Ciphers
danoli3 Apr 2, 2025
12f8c4a
cURL 8.11.0 -> 8.13.0
danoli3 Apr 2, 2025
c55e01d
tess2 cmake 3.5 minimum fix
danoli3 Apr 2, 2025
8f9fb69
curl - ignore brew dylib paths
danoli3 Apr 2, 2025
0dd7638
curl cmake updates
danoli3 Apr 2, 2025
c783d5d
curl path searchs restricted for zstd linking error to dynamic
danoli3 Apr 3, 2025
a62b31b
CMake List min 3.5
danoli3 Apr 3, 2025
7254248
Fix cmake 3.0 to 3.22
danoli3 Apr 23, 2025
b7cccab
curl system config macos
danoli3 Apr 23, 2025
ce13c55
Cairo [1.18.0 -> 1.18.4]
danoli3 Apr 23, 2025
7311732
Emscripten 4.0.4 -> 4.0.7
danoli3 Apr 23, 2025
66086a7
Update cairo to use gitlab as canonical source
danoli3 Apr 23, 2025
e6fc531
Emscripten fix
danoli3 Apr 23, 2025
072d321
Cairo
danoli3 Jul 17, 2025
2b2fbb3
Emscripten [4.0.7 -> 4.0.11]
danoli3 Jul 17, 2025
9585b08
curl [8.14.0 -> 8.15.0]
danoli3 Jul 17, 2025
454fca9
OpenSSL [4.4.1 -> 4.5.1]
danoli3 Jul 17, 2025
9513387
OpenCV [4.11.0 -> 4.12.0]
danoli3 Jul 18, 2025
923fe40
Revert "OpenSSL [4.4.1 -> 4.5.1]"
danoli3 Jul 18, 2025
dfefdb5
OpenCV Fix emscripten
danoli3 Jul 18, 2025
7e62d60
Windows Server Update
danoli3 Jul 18, 2025
161789d
2019 disabed
danoli3 Jul 18, 2025
862232c
2019
danoli3 Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 .github/workflows/build-vs2019-x64.yml → .github/disabled/build-vs2019-x64.yml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .github/workflows/build-emscripten.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ concurrency:

env:
TARGET: "emscripten"
EMSDK_VERSION: "4.0.4"
EMSDK_VERSION: "4.0.11"
USE_ARTIFACT: true
PTHREADS_ENABLED: 1
NO_FORCE: 1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-vs2022-arm64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
build-vs2022-arm64:
if: needs.pre-check.outputs.workflow_disabled != 'true'
needs: pre-check
runs-on: windows-2022
runs-on: windows-2025
strategy:
matrix:
bundle: [1,2]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-vs2022-arm64ec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
build-vs2022-arm64ec:
if: needs.pre-check.outputs.workflow_disabled != 'true'
needs: pre-check
runs-on: windows-2022
runs-on: windows-2025
strategy:
matrix:
bundle: [1,2]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-vs2022-x64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
build-vs2022-64:
if: needs.pre-check.outputs.workflow_disabled != 'true'
needs: pre-check
runs-on: windows-2022
runs-on: windows-2025
strategy:
matrix:
bundle: [1,2]
Expand Down
2 changes: 1 addition & 1 deletion apothecary/formulas/cairo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.22)
project(cairo)

set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
Expand Down
20 changes: 12 additions & 8 deletions apothecary/formulas/cairo/cairo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ FORMULA_DEPENDS=("zlib" "libpng" "pixman" "freetype")
# as we set some env vars for osx the depends need to know about
FORMULA_DEPENDS_MANUAL=1

VER=1.18.0
VER=1.18.4
BUILD_ID=1
DEFINES=""

SHA1=fae6760ed0772681ddc60c603c9bb525ac74f000
SHA1="0a54ce94df6e9db9b9d55ada2ef58b6c47861fde"

# tools for git use
GIT_URL=http://anongit.freedesktop.org/git/cairo
Expand All @@ -37,18 +37,22 @@ function download() {

. "$DOWNLOADER_SCRIPT"

downloader ${URL}/cairo-$VER.tar.xz
tar -xJf cairo-$VER.tar.xz
CHECKSHA=$(shasum -a 1 cairo-$VER.tar.xz | cut -d ' ' -f1)
rm cairo-$VER.tar.xz
local TARBALL="cairo-${VER}.tar"

downloader "${GIT_LAB}.tar"

CHECKSHA=$(shasum -a 1 "${TARBALL}" | cut -d ' ' -f1)
if [ "$CHECKSHA" != "$SHA1" ]; then
echoError "ERROR! SHA did not Verify: [$CHECKSHA] SHA on Record:[$SHA1] - Developer has not updated SHA or Man in the Middle Attack"
exit
exit 1
else
echo "SHA for Download Verified Successfully: [$CHECKSHA] SHA on Record:[$SHA1]"
fi

mv "cairo-$VER" cairo
tar -xf "${TARBALL}"
rm "${TARBALL}"

mv "cairo-${VER}" cairo

# if [ "$TYPE" == "vs" ] ; then
# downloader ${GIT_LAB}.zip
Expand Down
7 changes: 3 additions & 4 deletions apothecary/formulas/cairo/src/cairo-wideint-type-private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,9 @@
# include <inttypes.h>
#elif HAVE_SYS_INT_TYPES_H
# include <sys/int_types.h>
#else
#error Cannot find definitions for fixed-width integral types (uint8_t, uint32_t, etc.)
#endif

#if defined(_MSC_VER)
#if defined(_MSC_VER) && !defined(HAVE_STDINT_H)
typedef __int8 int8_t;
typedef unsigned __int8 uint8_t;
typedef __int16 int16_t;
Expand All @@ -60,10 +58,11 @@
typedef unsigned __int32 uint32_t;
typedef __int64 int64_t;
typedef unsigned __int64 uint64_t;
#endif

# ifndef HAVE_UINT64_T
# define HAVE_UINT64_T 1
# endif
#endif

#ifndef INT16_MIN
# define INT16_MIN (-32767-1)
Expand Down
73 changes: 52 additions & 21 deletions apothecary/formulas/curl/curl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ FORMULA_DEPENDS=("openssl" "zlib" "brotli")

# Android to implementation 'com.android.ndk.thirdparty:curl:7.79.1-beta-1'

VER=8.11.0
VER_D=8_11_0
SHA1=9648c31756362343f1a0daba881e189d6fe8b4f4
VER=8.15.0
VER_D=8_15_0
SHA1="5b4e79489e2d24da13d2fa75897f69ca5fff741e"
BUILD_ID=1
DEFINES=""
USE_OPENSSL=ON

# tools for git use
GIT_URL=https://github.com/curl/curl
Expand All @@ -38,6 +39,9 @@ function download() {
fi
rm curl*.tar.gz

curl -LO https://curl.se/ca/cacert.pem
mv cacert.pem curl/cacert.pem

}

# prepare the build environment, executed inside the lib src dir
Expand Down Expand Up @@ -71,6 +75,9 @@ function prepare() {
fi
echo "prepared"




}

# executed inside the lib src dir
Expand All @@ -84,6 +91,8 @@ function build() {
export OPENSSL_PATH=$OF_LIBS_OPENSSL_ABS_PATH
fi

local CACERT_PATH=$(realpath ./cacert.pem)

if [ "$TYPE" == "vs" ]; then
export OPENSSL_LIBRARIES=$OF_LIBS_OPENSSL_ABS_PATH/lib/$TYPE/$PLATFORM
export OPENSSL_WINDOWS_PATH=$(cygpath -w ${OF_LIBS_OPENSSL_ABS_PATH} | sed "s/\\\/\\\\\\\\/g")
Expand Down Expand Up @@ -114,14 +123,26 @@ function build() {
LIBBROTLI_ENC_LIB="$LIBBROTLI_LIBRARY/brotlienc.lib"
LIBBROTLI_DEC_LIB="$LIBBROTLI_LIBRARY/brotlidec.lib"

if [ "$USE_OPENSSL" == "ON" ]; then
OPENSSL_DEFS="-DCURL_USE_OPENSSL=ON \
-DUSE_OPENSSL=ON \
-DCURL_CA_FALLBACK=ON \
-DCURL_CA_BUNDLE=$CACERT_PATH \
-DCURL_CA_EMBED=$CACERT_PATH"
CACERT_PATH=$(realpath "${CACERT_PATH}")
OPENSSL_DEFS="${OPENSSL_DEFS} -DCURL_CA_BUNDLE=${CACERT_PATH} -DCURL_CA_EMBED=${CACERT_PATH}"
else
OPENSSL_DEFS="-DCURL_USE_OPENSSL=OFF -DUSE_OPENSSL=OFF -DCURL_USE_SCHANNEL=ON"
fi

export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig;${PKG_CONFIG_PATH};${OF_LIBS_OPENSSL}/lib/$TYPE/$PLATFORM;${ZLIB_ROOT}/lib/$TYPE/$PLATFORM;${LIBBROTLI_ROOT}/lib/$TYPE/$PLATFORM"

DEFS="-DLIBRARY_SUFFIX=${ARCH} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_C_STANDARD=${C_STANDARD} \
-DCMAKE_CXX_STANDARD=${CPP_STANDARD} \
-DCMAKE_CXX_STANDARD_REQUIRED=ON \
-DCMAKE_CXX_EXTENSIONS=OFF
-DCMAKE_CXX_EXTENSIONS=OFF \
-DBUILD_SHARED_LIBS=OFF \
-DCMAKE_INSTALL_PREFIX=Release \
-DCMAKE_INCLUDE_OUTPUT_DIRECTORY=include \
Expand All @@ -140,11 +161,13 @@ function build() {
-DBUILD_STATIC_LIBS=ON \
-DBUILD_STATIC_CURL=ON \
-DCURL_STATICLIB=ON \
-DCURL_USE_LIBPSL=OFF \
-DBUILD_STATIC_LIBS=ON \
-DUSE_LIBIDN2=OFF \
-DENABLE_UNICODE=ON \
-DCURL_USE_OPENSSL=ON \
${OPENSSL_DEFS} \
-DUSE_SSLEAY=ON \
-DUSE_NGHTTP2=ON \
-DUSE_OPENSSL=ON \
-DCURL_USE_OPENSSL=ON \
-DCMAKE_INSTALL_LIBDIR="lib" \
Expand Down Expand Up @@ -193,6 +216,7 @@ function build() {
-DOPENSSL_INCLUDE_DIR=${OF_LIBS_OPENSSL_ABS_PATH}/include \
-DOPENSSL_CRYPTO_LIBRARY=${OPENSSL_LIBRARY_CRYPT} \
-DOPENSSL_SSL_LIBRARY=${OPENSSL_LIBRARY} \
-DCURL_CA_BUNDLE=$CACERT_PATH \
-DOPENSSL_LIBRARIES=${OF_LIBS_OPENSSL_ABS_PATH}/lib/${TYPE}/${PLATFORM}/libssl.a;${OF_LIBS_OPENSSL_ABS_PATH}/lib/${TYPE}/${PLATFORM}/libcrypto.a"

ZLIB_ROOT="$LIBS_ROOT/zlib/"
Expand All @@ -205,7 +229,6 @@ function build() {
LIBBROTLI_LIBRARY="$LIBS_ROOT/brotli/lib/$TYPE/$PLATFORM/libbrotlicommon.a"
LIBBROTLI_ENC_LIB="$LIBS_ROOT/brotli/lib/$TYPE/$PLATFORM/libbrotlienc.a"
LIBBROTLI_DEC_LIB="$LIBS_ROOT/brotli/lib/$TYPE/$PLATFORM/libbrotlidec.a"

export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:${PKG_CONFIG_PATH}:${OPENSSL_ROOT}/lib/$TYPE/$PLATFORM:${ZLIB_ROOT}/lib/$TYPE/$PLATFORM:${LIBBROTLI_ROOT}/lib/$TYPE/$PLATFORM"

echo "building curl $TYPE | $PLATFORM"
Expand Down Expand Up @@ -237,6 +260,7 @@ function build() {
-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON \
-DCURL_STATICLIB=ON \
-DBUILD_STATIC_LIBS=ON \
-DCURL_CA_FALLBACK=ON \
-DENABLE_UNICODE=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=Release \
Expand All @@ -263,9 +287,8 @@ function build() {
-DCURL_ENABLE_SSL=${CURL_ENABLE_SSL} \
-DUSE_SECURE_TRANSPORT=${USE_SECURE_TRANSPORT} \
-DCURL_USE_SECTRANSP=${USE_SECURE_TRANSPORT} \
-DUSE_NGHTTP2=OFF \
-DUSE_NGHTTP2=ON \
-DCURL_DISABLE_POP3=ON \
-DCURL_CA_FALLBACK=ON \
-DCURL_DISABLE_IMAP=ON \
-DENABLE_WEBSOCKETS=ON \
-DENABLE_UNIX_SOCKETS=ON \
Expand Down Expand Up @@ -307,18 +330,18 @@ function build() {

elif [[ "$TYPE" =~ ^(osx|ios|tvos|xros|catos|watchos)$ ]]; then

if [[ ! "$TYPE" =~ ^(tvos|catos|watchos)$ ]]; then
export OPENSSL_LIBRARIES=$OF_LIBS_OPENSSL_ABS_PATH/lib/$TYPE/$PLATFORM
OPENSSL_ROOT="$LIBS_ROOT/openssl/"
OPENSSL_INCLUDE_DIR="$LIBS_ROOT/openssl/include"
OPENSSL_LIBRARY="$LIBS_ROOT/openssl/lib/$TYPE/$PLATFORM/libssl.a"
OPENSSL_LIBRARY_CRYPT="$LIBS_ROOT/openssl/lib/$TYPE/$PLATFORM/libcrypto.a"
USE_SECURE_TRANSPORT=OFF
CURL_ENABLE_SSL=ON
SSL_DEFS="-DOPENSSL_ROOT_DIR=${OF_LIBS_OPENSSL_ABS_PATH} \
-DOPENSSL_INCLUDE_DIR=${OF_LIBS_OPENSSL_ABS_PATH}/include \
-DOPENSSL_LIBRARIES=${OF_LIBS_OPENSSL_ABS_PATH}/lib/${TYPE}/${PLATFORM}/libssl.a:${OF_LIBS_OPENSSL_ABS_PATH}/lib/${TYPE}/${PLATFORM}/libcrypto.a"
else
# if [[ ! "$TYPE" =~ ^(tvos|catos|watchos)$ ]]; then
# export OPENSSL_LIBRARIES=$OF_LIBS_OPENSSL_ABS_PATH/lib/$TYPE/$PLATFORM
# OPENSSL_ROOT="$LIBS_ROOT/openssl/"
# OPENSSL_INCLUDE_DIR="$LIBS_ROOT/openssl/include"
# OPENSSL_LIBRARY="$LIBS_ROOT/openssl/lib/$TYPE/$PLATFORM/libssl.a"
# OPENSSL_LIBRARY_CRYPT="$LIBS_ROOT/openssl/lib/$TYPE/$PLATFORM/libcrypto.a"
# USE_SECURE_TRANSPORT=OFF
# CURL_ENABLE_SSL=ON
# SSL_DEFS="-DOPENSSL_ROOT_DIR=${OF_LIBS_OPENSSL_ABS_PATH} \
# -DOPENSSL_INCLUDE_DIR=${OF_LIBS_OPENSSL_ABS_PATH}/include \
# -DOPENSSL_LIBRARIES=${OF_LIBS_OPENSSL_ABS_PATH}/lib/${TYPE}/${PLATFORM}/libssl.a:${OF_LIBS_OPENSSL_ABS_PATH}/lib/${TYPE}/${PLATFORM}/libcrypto.a"
# else
# disabled for tvOS SSL
OPENSSL_ROOT="$LIBS_ROOT"
OPENSSL_INCLUDE_DIR=""
Expand All @@ -330,7 +353,7 @@ function build() {
CURL_ENABLE_SSL=OFF
SSL_DEFS=""

fi
# fi

ZLIB_ROOT="$LIBS_ROOT/zlib/"
ZLIB_INCLUDE_DIR="$LIBS_ROOT/zlib/include"
Expand All @@ -350,10 +373,12 @@ function build() {
mkdir -p "build_${TYPE}_${PLATFORM}"
cd "build_${TYPE}_${PLATFORM}"
rm -f CMakeCache.txt *.a *.o *.lib

cmake .. \
-DCMAKE_C_STANDARD=${C_STANDARD} \
-DCMAKE_CXX_STANDARD=${CPP_STANDARD} \
-DCMAKE_CXX_STANDARD_REQUIRED=ON \
-DCURL_CA_BUNDLE="$CACERT_PATH" \
-DCMAKE_CXX_FLAGS="-DUSE_PTHREADS=1 ${FLAG_RELEASE} -Wno-error=implicit-function-declaration" \
-DCMAKE_C_FLAGS="-DUSE_PTHREADS=1 ${FLAG_RELEASE} -Wno-error=implicit-function-declaration" \
-DENABLE_STRICT_TRY_COMPILE=ON \
Expand Down Expand Up @@ -382,6 +407,8 @@ function build() {
-DCMAKE_MINIMUM_REQUIRED_VERSION=3.22 \
-DCURL_DISABLE_LDAP=ON \
-DENABLE_VISIBILITY=OFF \
-DCURL_DISABLE_ZSTD=ON \
-DCURL_ZSTD=OFF \
${SSL_DEFS} \
-DCMAKE_PREFIX_PATH="${LIBS_ROOT}" \
-DZLIB_ROOT=${ZLIB_ROOT} \
Expand All @@ -398,12 +425,16 @@ function build() {
-DUSE_SECURE_TRANSPORT=${USE_SECURE_TRANSPORT} \
-DCURL_USE_SECTRANSP=${USE_SECURE_TRANSPORT} \
-DUSE_NGHTTP2=OFF \
-DUSE_NGTCP2=OFF \
-DCURL_CA_FALLBACK=ON \
-DCURL_DISABLE_POP3=ON \
-DCURL_CA_FALLBACK=ON \
-DCURL_DISABLE_IMAP=ON \
-DENABLE_WEBSOCKETS=ON \
-DENABLE_UNIX_SOCKETS=ON \
-DCURL_BROTLI=ON \
-DCMAKE_PREFIX_PATH="${LIBS_ROOT}" \
-DCMAKE_FIND_ROOT_PATH="${LIBS_ROOT}" \
-DBROTLI_INCLUDE_DIRS=${LIBBROTLI_INCLUDE_DIR} \
-DBROTLIDEC_LIBRARY=${LIBBROTLI_DEC_LIB} \
-DBROTLICOMMON_LIBRARY=${LIBBROTLI_LIBRARY} \
Expand Down
2 changes: 1 addition & 1 deletion apothecary/formulas/glew/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ endif ()

project (glew C)

cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 3.5)

include(GNUInstallDirs)

Expand Down
15 changes: 7 additions & 8 deletions apothecary/formulas/opencv/opencv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ FORMULA_TYPES=("osx" "ios" "catos" "xros" "tvos" "vs" "android" "emscripten" "li
FORMULA_DEPENDS=("zlib" "libpng" )

# define the version
VER=4.11.0
VER=4.12.0
BUILD_ID=8
DEFINES=""
FRAMEWORKS=""
FILE_VERSION=4110
FILE_VERSION=4120

# tools for git use
GIT_URL=https://github.com/opencv/opencv
Expand Down Expand Up @@ -565,7 +565,8 @@ function build() {
if [[ "$ABI" =~ ^(armeabi-v7a|arm64-v8a)$ ]]; then # Enable NEON with VFPv3
EXTRA_DEFS="-DCV_ENABLE_INTRINSICS=ON -DCPU_BASELINE='NEON;VFPV3' -DCPU_DISPATCH=''"
else
EXTRA_DEFS="-DCV_ENABLE_INTRINSICS=ON -DCPU_BASELINE='SSE2' -DCPU_DISPATCH='SSE4_1;SSE4_2'"
#EXTRA_DEFS="-DCV_ENABLE_INTRINSICS=ON -DCPU_BASELINE='SSE2' -DCPU_DISPATCH='SSE4_1;SSE4_2'"
EXTRA_DEFS="-DCV_ENABLE_INTRINSICS=OFF "
fi

cmake .. ${CORE_DEFS} ${DEFINES} \
Expand Down Expand Up @@ -639,7 +640,6 @@ function build() {
-DWITH_TIFF=OFF \
-DBUILD_JPEG=OFF \
-DWITH_JPEG=OFF \
-DBUILD_OPENJPEG=OFF \
-DWITH_OPENJPEG=OFF \
-DBUILD_OPENJPEG=OFF \
-DBUILD_OPENEXR=OFF \
Expand Down Expand Up @@ -767,9 +767,8 @@ function build() {
-DWITH_TIFF=OFF \
-DBUILD_JPEG=OFF \
-DWITH_JPEG=OFF \
-DBUILD_OPENJPEG=OFF \
-DWITH_OPENJPEG=OFF \
-BUILD_OPENJPEG=OFF \
-DBUILD_OPENJPEG=OFF \
-DBUILD_OPENEXR=OFF \
-DBUILD_IPP_IW=OFF \
-DWITH_MATLAB=OFF \
Expand Down Expand Up @@ -828,7 +827,7 @@ function build() {
-DBUILD_WASM_INTRIN_TESTS=OFF"

$EMSDK/upstream/emscripten/emcmake cmake .. \
-B build \
-B . \
${DEFINES} \
-DCMAKE_TOOLCHAIN_FILE=$EMSDK/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake \
-DCMAKE_C_STANDARD=${C_STANDARD} \
Expand All @@ -851,7 +850,7 @@ function build() {
-DPNG_PNG_INCLUDE_DIR=${LIBPNG_INCLUDE_DIR} \
-DPNG_LIBRARY=${LIBPNG_LIBRARY}

cmake --build build --target install --config Release
cmake --build . --target install --config Release
fi

}
Expand Down
Loading
Loading