Maintenance.

agarny · May 28, 2024 · df76412 · df76412
2 parents 9be11fd + 97a7e4c
commit df76412
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 30 deletions.
diff --git a/src/3rdparty/OpenSSL/CMakeLists.txt b/src/3rdparty/OpenSSL/CMakeLists.txt
@@ -13,9 +13,9 @@
 # limitations under the License.
 
 set(PACKAGE_NAME OpenSSL)
-set(PACKAGE_VERSION 3.0.3)
+set(PACKAGE_VERSION 3.0.13)
 set(PACKAGE_REPOSITORY openssl)
-set(RELEASE_TAG openssl-3.0.3-libopencor)
+set(RELEASE_TAG openssl-3.0.13)
 set(INSTALL_DIR ${PREBUILT_DIR}/${PACKAGE_NAME})
 
 # Either retrieve or build our package.
@@ -25,26 +25,26 @@ if(LIBOPENCOR_PREBUILT_OPENSSL)
         if(RELEASE_MODE)
             retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                              ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                             558ef03a9b9cce739a7f3e2699d5b698c8b2fba3)
+                             02f852f95f8494d1defcf6cfa609b59bda77c8ba)
         else()
             retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                              ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                             2bc0770b3d9abca54eaa5ddb1e434b28be7326ee)
+                             ed11c82b4ea3d62633dc106391be4ef98d2303c7)
         endif()
     elseif(APPLE)
         if(INTEL_MODE)
             retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                              ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                             847b9b0e0c70bf4b458796c453d8c03c4b0d4252)
+                             6032fb3e7059dbb6554245ecb951e142b9d7e1a5)
         else()
             retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                              ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                             ae38760197be0715d0398cd88945ad74fe16ff45)
+                             bc3b9c9a2453543cf3115221d912434ac79f19ce)
         endif()
     else()
         retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                          ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                         f3f1619acc385df0165fbb932fdf23f5b6eb5179)
+                         6a87632104f6c0e4d2d1c45cc41077a50e6b324d)
     endif()
 else()
     # Build our package.

diff --git a/src/3rdparty/libcurl/CMakeLists.txt b/src/3rdparty/libcurl/CMakeLists.txt
@@ -13,9 +13,9 @@
 # limitations under the License.
 
 set(PACKAGE_NAME libcurl)
-set(PACKAGE_VERSION 7.83.1)
+set(PACKAGE_VERSION 8.8.0)
 set(PACKAGE_REPOSITORY curl)
-set(RELEASE_TAG curl-7_83_1)
+set(RELEASE_TAG curl-8_8_0)
 set(INSTALL_DIR ${PREBUILT_DIR}/${PACKAGE_NAME})
 
 if(WIN32 AND NOT RELEASE_MODE)
@@ -29,26 +29,26 @@ if(LIBOPENCOR_PREBUILT_LIBCURL)
         if(RELEASE_MODE)
             retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                              ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                             a0e03230c20533bea04ceba6a2587b8878eca80f)
+                             2263a79bc3cbed3bd3dd7b6f3f8a4d6d275fff03)
         else()
             retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                              ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                             f4352511ab7e1e90d691265a8d7814388e43aec2)
+                             85a193ace0817a0911e6872fd39be55a6282ecd6)
         endif()
     elseif(APPLE)
         if(INTEL_MODE)
             retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                              ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                             8476306e95a657dc0a224b19797b9cdea5215c5f)
+                             cb404fb788b0723741ef017638909f110aa21b71)
         else()
             retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                              ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                             d7e55af2f4f71599680b5c6dd1c3953b729548d0)
+                             d9810db1c8e59ec58f691239bba876443263ac03)
         endif()
     else()
         retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                          ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                         a1251435ea2228af7e87a9f6ed1d7bd89a7592a1)
+                         01e1b34073fd5e26ff81fd97c6c6730f9398443a)
     endif()
 else()
     # Build our package.

diff --git a/src/3rdparty/libssh2/CMakeLists.txt b/src/3rdparty/libssh2/CMakeLists.txt
@@ -13,9 +13,9 @@
 # limitations under the License.
 
 set(PACKAGE_NAME libssh2)
-set(PACKAGE_VERSION 1.10.0)
+set(PACKAGE_VERSION 1.11.0)
 set(PACKAGE_REPOSITORY libssh2)
-set(RELEASE_TAG libssh2-1.10.0)
+set(RELEASE_TAG libssh2-1.11.0)
 set(INSTALL_DIR ${PREBUILT_DIR}/${PACKAGE_NAME})
 
 # Either retrieve or build our package.
@@ -25,26 +25,26 @@ if(LIBOPENCOR_PREBUILT_LIBSSH2)
         if(RELEASE_MODE)
             retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                              ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                             a036e09966b8fe4fb51799b6027ef751d2d853bf)
+                             af719d88ecb750983ec9d6c6ca5cea456b58bc5b)
         else()
             retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                              ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                             61ad26586df1fbf494c43e12548898a285a84d4b)
+                             e0b998b00415258d9e335d005ae2a07e4f2a19b3)
         endif()
     elseif(APPLE)
         if(INTEL_MODE)
             retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                              ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                             555726b2220a89d3de8c405297d2898311ff415e)
+                             fc6a42100feb766cb050938ebd0da3db26576c46)
         else()
             retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                              ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                             52a3363adaeeccf94116e689af1ed541bfa14aaa)
+                             daa12bcce6e69da42a25c0351df2e412e3d7b976)
         endif()
     else()
         retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
                          ${PACKAGE_REPOSITORY} ${RELEASE_TAG}
-                         748feccb81c12663f28023b171925ee255ed3acc)
+                         f28e2918a1af667a2609f31e628c6e94bb7610ab)
     endif()
 else()
     # Build our package.
@@ -55,12 +55,14 @@ else()
         DOWNLOAD_NO_PROGRESS ON
         CMAKE_ARGS
             -DBUILD_EXAMPLES=OFF
+            -DBUILD_SHARED_LIBS=OFF
+            -DBUILD_STATIC_LIBS=ON
             -DBUILD_TESTING=OFF
             ${CMAKE_ARGS}
             -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
-            -DOPENSSL_CRYPTO_LIBRARY=${OPENSSL_LIBCRYPTO_LIBRARY_FILE}
-            -DOPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR}
-            -DOPENSSL_SSL_LIBRARY=${OPENSSL_LIBSSL_LIBRARY_FILE}
+            -DCRYPTO_BACKEND=OpenSSL
+            -DENABLE_ZLIB_COMPRESSION=OFF
+            -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR}
     )
 
     # Patch some of our CMake configuration files.
@@ -71,7 +73,7 @@ else()
         set(PACKAGE_MODE debug)
     endif()
 
-    set(CONFIG_FILE ${INSTALL_DIR}/lib/cmake/${PACKAGE}/Libssh2Config-${PACKAGE_MODE}.cmake)
+    set(CONFIG_FILE ${INSTALL_DIR}/lib/cmake/${PACKAGE}/Libssh2Config.cmake)
 
     file(READ ${CONFIG_FILE} FILE_CONTENTS)
 
@@ -96,5 +98,5 @@ set(LIBSSH2_ROOT ${INSTALL_DIR} CACHE INTERNAL "${PACKAGE_NAME}'s root directory
 set(LIBSSH2_CMAKE_DIR ${INSTALL_DIR}/lib/cmake/libssh2 CACHE INTERNAL "${PACKAGE_NAME}'s CMake directory.")
 set(LIBSSH2_CMAKE_PACKAGE_NAME Libssh2 CACHE INTERNAL "${PACKAGE_NAME}'s CMake package name.")
 set(LIBSSH2_INCLUDE_DIR ${INSTALL_DIR}/include CACHE INTERNAL "${PACKAGE_NAME}'s include directory.")
-set(LIBSSH2_LIBRARY Libssh2::libssh2 CACHE INTERNAL "${PACKAGE_NAME}'s library.")
+set(LIBSSH2_LIBRARY Libssh2::libssh2_static CACHE INTERNAL "${PACKAGE_NAME}'s library.")
 set(LIBSSH2_LIBRARY_FILE ${INSTALL_DIR}/lib/${PACKAGE_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX} CACHE INTERNAL "${PACKAGE_NAME}'s library.")
diff --git a/tests/api/version/tests.cpp b/tests/api/version/tests.cpp
@@ -44,8 +44,8 @@ TEST(VersionTest, libCOMBINE)
 
 TEST(VersionTest, libcurl)
 {
-    EXPECT_EQ(0x075301U, libOpenCOR::libcurlVersion());
-    EXPECT_EQ("7.83.1-DEV", libOpenCOR::libcurlVersionString());
+    EXPECT_EQ(0x080800U, libOpenCOR::libcurlVersion());
+    EXPECT_EQ("8.8.0-DEV", libOpenCOR::libcurlVersionString());
 }
 
 TEST(VersionTest, libSEDML)

diff --git a/tests/bindings/python/test_version.py b/tests/bindings/python/test_version.py
@@ -58,12 +58,12 @@ def test_libcombine_version_string():
 
 def test_libcurl_version():
     assert isinstance(oc.libcurl_version(), int)
-    assert oc.libcurl_version() == 0x075301
+    assert oc.libcurl_version() == 0x080800
 
 
 def test_libcurl_version_string():
     assert isinstance(oc.libcurl_version_string(), str)
-    assert oc.libcurl_version_string() == "7.83.1-DEV"
+    assert oc.libcurl_version_string() == "8.8.0-DEV"
 
 
 def test_libsedml_version():