From b36908d914bde22cfdfa7b3c77568de70f626ec3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 1 Jun 2024 12:32:34 +0000 Subject: [PATCH 1/3] chore(deps): update boringssl digest to a8ff0b5 --- repositories/repositories.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/repositories/repositories.bzl b/repositories/repositories.bzl index 2a090d47..803d7307 100644 --- a/repositories/repositories.bzl +++ b/repositories/repositories.bzl @@ -140,9 +140,9 @@ def ros2_workspace_repositories(): maybe( http_archive, name = "boringssl", - sha256 = "3a70c886a23415c45f89000027511927626894b860a07cc969c71c7b72653339", - strip_prefix = "boringssl-e39ac226e3020f106600c3610fb95d83071fa42c", - urls = ["https://github.com/hedronvision/boringssl/archive/e39ac226e3020f106600c3610fb95d83071fa42c.tar.gz"], + sha256 = "6ab909a507c941e0e9e27478f0011cff148554c5cde5ba6eed50705a8804c0f0", + strip_prefix = "boringssl-a8ff0b5468613da4404c3e3ae180f301f1603f81", + urls = ["https://github.com/hedronvision/boringssl/archive/a8ff0b5468613da4404c3e3ae180f301f1603f81.tar.gz"], ) maybe( From dda02a0b8a0feebdd27e318b189dd7e7bad53b76 Mon Sep 17 00:00:00 2001 From: Milan Vukov Date: Sat, 1 Jun 2024 15:26:42 +0200 Subject: [PATCH 2/3] Upgrade and fix curl build --- repositories/curl.BUILD.bazel | 6 ++---- repositories/patches/curl_fix_openssl.patch | 22 +++++++++++++++++++++ repositories/repositories.bzl | 8 +++++--- 3 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 repositories/patches/curl_fix_openssl.patch diff --git a/repositories/curl.BUILD.bazel b/repositories/curl.BUILD.bazel index fa71afe8..87aff902 100644 --- a/repositories/curl.BUILD.bazel +++ b/repositories/curl.BUILD.bazel @@ -18,6 +18,8 @@ cmake( cache_entries = { "CMAKE_POSITION_INDEPENDENT_CODE": "ON", # Must be set! "CMAKE_PREFIX_PATH": "$EXT_BUILD_DEPS/openssl:$EXT_BUILD_DEPS/zlib", + "OPENSSL_CRYPTO_LIBRARY": "$EXT_BUILD_DEPS/openssl/lib/libcrypto.a", + "OPENSSL_SSL_LIBRARY": "$EXT_BUILD_DEPS/openssl/lib/libssl.a", # curl specific options. # For the following flags, process CMakeLists.txt with option\(([^\s]+) # on e.g. https://regexr.com/ . @@ -35,7 +37,6 @@ cmake( "CURL_ENABLE_EXPORT_TARGET": "OFF", "CURL_DISABLE_ALTSVC": "OFF", "CURL_DISABLE_COOKIES": "OFF", - "CURL_DISABLE_CRYPTO_AUTH": "OFF", "CURL_DISABLE_DICT": "OFF", "CURL_DISABLE_DOH": "OFF", "CURL_DISABLE_FILE": "OFF", @@ -67,14 +68,12 @@ cmake( "CURL_DISABLE_VERBOSE_STRINGS": "OFF", "HTTP_ONLY": "OFF", "ENABLE_IPV6": "ON", - "ENABLE_MANUAL": "OFF", "CURL_ENABLE_SSL": "ON", "CURL_USE_SECTRANSP": "OFF", "CURL_USE_SCHANNEL": "OFF", "CURL_WINDOWS_SSPI": "OFF", "CURL_USE_MBEDTLS": "OFF", "CURL_USE_BEARSSL": "OFF", - "CURL_USE_NSS": "OFF", "CURL_USE_WOLFSSL": "OFF", "CURL_USE_OPENSSL": "ON", "CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG": "OFF", @@ -85,7 +84,6 @@ cmake( "USE_QUICHE": "OFF", "USE_MSH3": "OFF", "USE_WIN32_LDAP": "OFF", - "CURL_USE_OPENLDAP": "OFF", "USE_LIBIDN2": "OFF", "USE_WIN32_IDN": "OFF", "CURL_USE_LIBPSL": "OFF", diff --git a/repositories/patches/curl_fix_openssl.patch b/repositories/patches/curl_fix_openssl.patch new file mode 100644 index 00000000..6f40c6d6 --- /dev/null +++ b/repositories/patches/curl_fix_openssl.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c3525d3fc..5f71d8d4a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -469,15 +469,8 @@ if(CURL_USE_OPENSSL) + set(SSL_ENABLED ON) + set(USE_OPENSSL ON) + +- # Depend on OpenSSL via imported targets if supported by the running +- # version of CMake. This allows our dependents to get our dependencies +- # transitively. +- if(NOT CMAKE_VERSION VERSION_LESS 3.4) +- list(APPEND CURL_LIBS OpenSSL::SSL OpenSSL::Crypto) +- else() +- list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES}) +- include_directories(${OPENSSL_INCLUDE_DIR}) +- endif() ++ list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES}) ++ include_directories(${OPENSSL_INCLUDE_DIR}) + + if(CURL_DEFAULT_SSL_BACKEND AND CURL_DEFAULT_SSL_BACKEND STREQUAL "openssl") + set(valid_default_ssl_backend TRUE) diff --git a/repositories/repositories.bzl b/repositories/repositories.bzl index 803d7307..03114870 100644 --- a/repositories/repositories.bzl +++ b/repositories/repositories.bzl @@ -171,9 +171,11 @@ def ros2_workspace_repositories(): http_archive, name = "curl", build_file = "@com_github_mvukov_rules_ros2//repositories:curl.BUILD.bazel", - sha256 = "230d61a4b1eb3346930f2d601cc8fe5237957163e16befbe15e0ef40c56767a2", - strip_prefix = "curl-curl-8_2_1", - urls = ["https://github.com/curl/curl/archive/refs/tags/curl-8_2_1.tar.gz"], + sha256 = "77c0e1cd35ab5b45b659645a93b46d660224d0024f1185e8a95cdb27ae3d787d", + strip_prefix = "curl-8.8.0", + urls = ["https://github.com/curl/curl/releases/download/curl-8_8_0/curl-8.8.0.tar.gz"], + patch_args = ["-p1"], + patches = ["@com_github_mvukov_rules_ros2//repositories/patches:curl_fix_openssl.patch"], ) maybe( From 6e15a786fb1ea7af54bad459b276fc3d70646d23 Mon Sep 17 00:00:00 2001 From: Milan Vukov Date: Sat, 5 Oct 2024 17:43:54 +0200 Subject: [PATCH 3/3] Add rules_license --- repositories/repositories.bzl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/repositories/repositories.bzl b/repositories/repositories.bzl index 03114870..e0cd1db9 100644 --- a/repositories/repositories.bzl +++ b/repositories/repositories.bzl @@ -214,6 +214,15 @@ def ros2_workspace_repositories(): urls = ["https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.tar.gz"], ) + maybe( + http_archive, + name = "rules_license", + sha256 = "26d4021f6898e23b82ef953078389dd49ac2b5618ac564ade4ef87cced147b38", + urls = [ + "https://github.com/bazelbuild/rules_license/releases/download/1.0.0/rules_license-1.0.0.tar.gz", + ], + ) + def ros2_repositories(): """Import ROS 2 repositories."""