From: Alejandro Hernandez Samaniego <[email protected]> Fixes CVE-2020-8277 [1] [1] https://nvd.nist.gov/vuln/detail/CVE-2020-8277
Signed-off-by: Alejandro Enedino Hernandez Samaniego <[email protected]> --- ...rror-mv-libcares.pc.cmakein-to-libcar.patch | 10 ++++------ .../c-ares/cmake-install-libcares.pc.patch | 18 ++++++++---------- .../{c-ares_1.16.1.bb => c-ares_1.17.1.bb} | 4 ++-- 3 files changed, 14 insertions(+), 18 deletions(-) rename meta-oe/recipes-support/c-ares/{c-ares_1.16.1.bb => c-ares_1.17.1.bb} (89%) diff --git a/meta-oe/recipes-support/c-ares/c-ares/0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch b/meta-oe/recipes-support/c-ares/c-ares/0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch index 8f15f8424..f593045ee 100644 --- a/meta-oe/recipes-support/c-ares/c-ares/0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch +++ b/meta-oe/recipes-support/c-ares/c-ares/0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch @@ -1,19 +1,20 @@ -From f2f1e134bf5d9d0789942848e03006af8d926cf8 Mon Sep 17 00:00:00 2001 +From 2c3e1b4f8768297c59e63e85addf821d922821d9 Mon Sep 17 00:00:00 2001 From: Wang Mingyu <[email protected]> Date: Tue, 17 Mar 2020 12:53:35 +0800 Subject: [PATCH] fix configure error : mv libcares.pc.cmakein to libcares.pc.cmake Signed-off-by: Wang Mingyu <[email protected]> + --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3a5878d..c2e5740 100644 +index d963d13..facd49f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -563,7 +563,7 @@ IF (CARES_STATIC) +@@ -560,7 +560,7 @@ IF (CARES_STATIC) ENDIF() # Write ares_config.h configuration file. This is used only for the build. @@ -22,6 +23,3 @@ index 3a5878d..c2e5740 100644 --- -2.17.1 - diff --git a/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch b/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch index 0eb7e4bbb..3219be23c 100644 --- a/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch +++ b/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch @@ -1,4 +1,4 @@ -From 12414304245cce6ef0e8b9547949be5109845353 Mon Sep 17 00:00:00 2001 +From d399ee2b00e0797e3edc1b6f4c0214b407d26574 Mon Sep 17 00:00:00 2001 From: Changqing Li <[email protected]> Date: Tue, 24 Jul 2018 13:33:33 +0800 Subject: [PATCH] cmake: Install libcares.pc @@ -11,12 +11,13 @@ Signed-off-by: Alexey Firago <[email protected]> update to 1.14.0, fix patch warning Signed-off-by: Changqing Li <[email protected]> + --- CMakeLists.txt | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index fd123e1..3a5878d 100644 +index 08c0247..d963d13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -214,22 +214,25 @@ ADD_DEFINITIONS(${SYSFLAGS}) @@ -50,9 +51,9 @@ index fd123e1..3a5878d 100644 # When checking for symbols, we need to make sure we set the proper # headers, libraries, and definitions for the detection to work properly -@@ -554,6 +557,15 @@ CONFIGURE_FILE (ares_build.h.cmake ${PROJECT_BINARY_DIR}/ares_build.h) - # Write ares_config.h configuration file. This is used only for the build. - CONFIGURE_FILE (ares_config.h.cmake ${PROJECT_BINARY_DIR}/ares_config.h) +@@ -551,6 +554,15 @@ ENDIF() + # Record toplevel CMakeLists.txt path + set(CARES_TOPLEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}") +# Pass required CFLAGS to pkg-config in case of static library +IF (CARES_STATIC) @@ -66,10 +67,10 @@ index fd123e1..3a5878d 100644 # TRANSFORM_MAKEFILE_INC # -@@ -728,6 +740,12 @@ IF (CARES_INSTALL) - INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" COMPONENT Devel DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") +@@ -625,6 +637,12 @@ IF (CARES_INSTALL) ENDIF () + +# pkg-config file +IF (CARES_INSTALL) + SET (PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig") @@ -79,6 +80,3 @@ index fd123e1..3a5878d 100644 # Legacy chain-building variables (provided for compatibility with old code). # Don't use these, external code should be updated to refer to the aliases directly (e.g., Cares::cares). SET (CARES_FOUND 1 CACHE INTERNAL "CARES LIBRARY FOUND") --- -2.17.1 - diff --git a/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb b/meta-oe/recipes-support/c-ares/c-ares_1.17.1.bb similarity index 89% rename from meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb rename to meta-oe/recipes-support/c-ares/c-ares_1.17.1.bb index 67dd70180..7861abe59 100644 --- a/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb +++ b/meta-oe/recipes-support/c-ares/c-ares_1.17.1.bb @@ -5,14 +5,14 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb997454c8d62aa6a47f07a8cd48b006" -PV = "1.16.0+gitr${SRCPV}" +PV = "1.17.1+gitr${SRCPV}" SRC_URI = "\ git://github.com/c-ares/c-ares.git \ file://cmake-install-libcares.pc.patch \ file://0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch \ " -SRCREV = "74a1426ba60e2cd7977e53a22ef839c87415066e" +SRCREV = "39c73b503d9ef70a58ad1f4a4643f15b01407c66" UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P<pver>\d+_(\d_?)+)" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#90033): https://lists.openembedded.org/g/openembedded-devel/message/90033 Mute This Topic: https://lists.openembedded.org/mt/81262135/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
