This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch support/2.4
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to refs/heads/support/2.4 by this push:
new f46a699f #667 upgrade libcurl to 8.4.0 to fix security issues.
f46a699f is described below
commit f46a699fe4eecc013ec366f2bd156a1b1830da9b
Author: PengZheng <[email protected]>
AuthorDate: Mon Dec 11 19:54:25 2023 +0800
#667 upgrade libcurl to 8.4.0 to fix security issues.
(cherry picked from commit 92d0a3ce680faed324e12354c9dc037dbd73fc77)
---
.github/workflows/coverage.yml | 3 +--
.github/workflows/macos.yml | 1 -
.github/workflows/ubuntu.yml | 3 +--
conanfile.py | 10 ++++++----
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 5c43d3f7..383b0118 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -57,8 +57,7 @@ jobs:
-o celix:enable_testing_on_ci=True
-o celix:enable_ccache=True
run: |
- #force require libcurl 7.64.1, due to a sha256 verify issue in
libcurl/7.87.0
- conan install . celix/ci -pr:b default -pr:h default -if build
${CONAN_BUILD_OPTIONS} -b missing -b cpputest --require-override=libcurl/7.64.1
--require-override=openssl/1.1.1s
+ conan install . celix/ci -pr:b default -pr:h default -if build
${CONAN_BUILD_OPTIONS} -b missing -b cpputest --require-override=openssl/1.1.1s
- name: Build
run: |
conan build . -bf build
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 54b9f9e7..cb46a128 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -61,7 +61,6 @@ jobs:
-o celix/*:enable_testing_for_cxx14=True
-o celix/*:enable_testing_dependency_manager_for_cxx11=True
run: |
- #force require libcurl 7.64.1, due to a sha256 verify issue in
libcurl/7.87.0
conan build . -c tools.cmake.cmaketoolchain:generator=Ninja -pr:b
default -pr:h default -s:b build_type=Release -s:h build_type=Release -of build
${CONAN_BUILD_OPTIONS} -b missing -b cpputest
- name: Test
run: |
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index fbf6ac77..2377a72c 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -82,8 +82,7 @@ jobs:
-o celix:framework_curlinit=False
-o celix:enable_ccache=True
run: |
- #force require libcurl 7.64.1, due to a sha256 verify issue in
libcurl/7.87.0
- conan install . celix/ci -c
tools.cmake.cmaketoolchain:generator=Ninja -pr:b release -pr:h default -if
build ${CONAN_BUILD_OPTIONS} -b missing -b cpputest
--require-override=libcurl/7.64.1 --require-override=openssl/1.1.1s
+ conan install . celix/ci -c
tools.cmake.cmaketoolchain:generator=Ninja -pr:b release -pr:h default -if
build ${CONAN_BUILD_OPTIONS} -b missing -b cpputest
--require-override=openssl/1.1.1s
- name: Build
env:
CC: ${{ matrix.compiler[0] }}
diff --git a/conanfile.py b/conanfile.py
index c32241cc..faca4d93 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -382,21 +382,21 @@ class CelixConan(ConanFile):
if self.options.build_utils:
self.requires("libzip/[>=1.7.3 <2.0.0]")
if self.options.build_framework or self.options.build_pubsub:
- self.requires("util-linux-libuuid/2.39")
+ self.requires("util-linux-libuuid/[>=2.39 <3.0.0]")
if ((self.options.build_framework and self.options.framework_curlinit)
or self.options.build_celix_etcdlib or
self.options.build_deployment_admin
or self.options.build_rsa_discovery_common or
self.options.build_rsa_remote_service_admin_dfi
or self.options.build_launcher):
- self.requires("libcurl/[>=7.64.1 <8.0.0]")
+ self.requires("libcurl/[>=8.4.0 <9.0.0]")
if self.options.build_deployment_admin:
- self.requires("zlib/[>=1.2.8 <2.0.0]")
+ self.requires("zlib/[>=1.2.13 <2.0.0]")
if (self.options.build_rsa_discovery_common or
self.options.build_shell_bonjour or
(self.options.build_rsa_remote_service_admin_dfi and
self.options.enable_testing)):
self.requires("libxml2/[>=2.9.9 <3.0.0]")
if self.options.build_cxx_remote_service_admin:
self.requires("rapidjson/[>=1.1.0 <2.0.0]")
if self.options.build_pubsub_psa_zmq:
- self.requires("zeromq/4.3.4")
+ self.requires("zeromq/[>=4.3.4 <5.0.0]")
self.requires("czmq/4.2.0")
if self.options.build_http_admin or
self.options.build_rsa_discovery_common \
or self.options.build_rsa_remote_service_admin_dfi:
@@ -409,6 +409,8 @@ class CelixConan(ConanFile):
# TODO: To be replaced with mdnsresponder/1790.80.10, resolve some
problems of mdnsresponder
# https://github.com/conan-io/conan-center-index/pull/16254
self.requires("mdnsresponder/1310.140.1")
+ # 'libzip/1.10.1' requires 'zlib/1.2.13' while 'libcurl/7.64.1'
requires 'zlib/1.2.12'
+ self.requires("zlib/1.2.13", override=True)
# the latest civetweb (1.16) is not ready for openssl3
self.requires("openssl/1.1.1t", override=True)
self.validate()
