From b74cea1cc2f8f8308ca184196d9db3414036ae07 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Oct 2024 07:07:55 +0000 Subject: [PATCH] net-libs/nghttp2: Sync with Gentoo It's from Gentoo commit cfad6d83e575e0ecd778b8068f2d8fed9eb94f08. --- .../nghttp2/files/nghttp2-1.63.0-cares.patch | 38 +++++++++++++++++++ .../net-libs/nghttp2/nghttp2-1.63.0.ebuild | 4 ++ 2 files changed, 42 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/net-libs/nghttp2/files/nghttp2-1.63.0-cares.patch diff --git a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/files/nghttp2-1.63.0-cares.patch b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/files/nghttp2-1.63.0-cares.patch new file mode 100644 index 0000000000..ed52866732 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/files/nghttp2-1.63.0-cares.patch @@ -0,0 +1,38 @@ +https://bugs.gentoo.org/941453 +https://github.com/nghttp2/nghttp2/issues/2253 +https://github.com/nghttp2/nghttp2/pull/2256 +https://github.com/nghttp2/nghttp2/commit/1ee4636528b1a8ea6769496750dda05f12104fa8 + +From 1ee4636528b1a8ea6769496750dda05f12104fa8 Mon Sep 17 00:00:00 2001 +From: Tatsuhiro Tsujikawa +Date: Tue, 15 Oct 2024 19:25:12 +0900 +Subject: [PATCH] cmake: Fix c-ares v1.34.0 version detection failure + +--- a/cmake/FindLibcares.cmake ++++ b/cmake/FindLibcares.cmake +@@ -17,12 +17,18 @@ find_library(LIBCARES_LIBRARY + ) + + if(LIBCARES_INCLUDE_DIR) +- set(_version_regex "^#define[ \t]+ARES_VERSION_STR[ \t]+\"([^\"]+)\".*") +- file(STRINGS "${LIBCARES_INCLUDE_DIR}/ares_version.h" +- LIBCARES_VERSION REGEX "${_version_regex}") +- string(REGEX REPLACE "${_version_regex}" "\\1" +- LIBCARES_VERSION "${LIBCARES_VERSION}") +- unset(_version_regex) ++ file(READ "${LIBCARES_INCLUDE_DIR}/ares_version.h" _ares_version_h) ++ string(REGEX REPLACE ".*#define[ \t]+ARES_VERSION_MAJOR[ \t]+([0-9]+).*" "\\1" ++ _ares_version_major ${_ares_version_h}) ++ string(REGEX REPLACE ".*#define[ \t]+ARES_VERSION_MINOR[ \t]+([0-9]+).*" "\\1" ++ _ares_version_minor ${_ares_version_h}) ++ string(REGEX REPLACE ".*#define[ \t]+ARES_VERSION_PATCH[ \t]+([0-9]+).*" "\\1" ++ _ares_version_patch ${_ares_version_h}) ++ set(LIBCARES_VERSION "${_ares_version_major}.${_ares_version_minor}.${_ares_version_patch}") ++ unset(_ares_version_patch) ++ unset(_ares_version_minor) ++ unset(_ares_version_major) ++ unset(_ares_version_h) + endif() + + include(FindPackageHandleStandardArgs) + diff --git a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.63.0.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.63.0.ebuild index 040b77645d..54c2599e4f 100644 --- a/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.63.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-libs/nghttp2/nghttp2-1.63.0.ebuild @@ -34,6 +34,10 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/${P}-cares.patch +) + multilib_src_configure() { #TODO: enable HTTP3 #requires quictls/openssl, libngtcp2, libngtcp2_crypto_quictls, libnghttp3