From 92d0a3ce680faed324e12354c9dc037dbd73fc77 Mon Sep 17 00:00:00 2001 From: PengZheng Date: Mon, 11 Dec 2023 19:54:25 +0800 Subject: [PATCH] #667 upgrade libcurl to 8.4.0 to fix security issues. --- .github/workflows/coverage.yml | 3 +-- .github/workflows/macos.yml | 1 - .github/workflows/ubuntu.yml | 3 +-- conanfile.py | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index c53f8b36a..e03444193 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -55,8 +55,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 565b297f0..435aac818 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -59,7 +59,6 @@ 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 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 a42f0774c..e1bd8ef01 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -80,8 +80,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 75c9b1bac..644b27995 100644 --- a/conanfile.py +++ b/conanfile.py @@ -374,7 +374,7 @@ def requirements(self): or self.options.build_celix_etcdlib 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_rsa_discovery_common or (self.options.build_rsa_remote_service_admin_dfi and self.options.enable_testing)): self.requires("libxml2/[>=2.9.9 <3.0.0]")