gentoo auto-resync : 17:10:2024 - 04:04:26

3 files changed, 44 insertions, 1 deletions

diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 73b5bc6022a3..b9dd18b8cdf2 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,3 +1,4 @@
+AUX nghttp2-1.63.0-cares.patch 1597 BLAKE2B 769af899d2d78dbfd130a93ec315d681d63e50ce82cda8c70bb91909084f79764b1ec9965b69a5ea9eba2423e6327d7b9c8eaeeff396864b8445aa1fc18bcc25 SHA512 8ca2c7e3e6e9161021bbaaff123c2d347e9458c64320d22e51e90522b09ea62a6d3ac22280384b901f7efe32b6aac47edb732f4a66af00a76878076a70f765c4
 DIST nghttp2-1.61.0.tar.xz 1645808 BLAKE2B e78fb94cc9234260447f0d3610e58e22f9eadc2dd8b79eec3c1bb10d5c03ad3a87f83d54e560e5bbdef5d60086c00b465caabca145485ecd636aa35a2cda616f SHA512 01e930d7caf464699505f92b76e2bc8192d168612dc564d2546812c42afea2fb81d552d70e8a5fed35e2bf5deadbec8eda095af94a2484bca41542988afce52a
 DIST nghttp2-1.62.0.tar.xz 1646596 BLAKE2B 156fe3cd401e89cb9416c3281318f955abe86909d249108781f8eaeb0ff3df791f083ae6fc7bfe04350b91ffeaf8d8799d138d9d7cc9f5121a344f69f7473915 SHA512 1674e269dcf1067312056e5ea0e7108a48a177888fbaae5a194bddcc9640babc996d86e74e3160cd0dc4a360f0440441116259f3b44a3ca5fea081cdff7e7c88
 DIST nghttp2-1.62.1.tar.xz 1606084 BLAKE2B 460152f08b4ebd98453b95b737e0729648b95e808e845114a47a23e39fb3c68bf5d165d71467fbca8069fd5e64a63eeedd025919af4e2186da083caa21b93130 SHA512 d5d6b068712e9b467547b0e5380465b8540317134f3f26c2b0c60eb9c604be2f37b4517a98b371d5f5fb668ce2ee35603ddd944224f11e96382aa541a6a17b4c
@@ -5,6 +6,6 @@ DIST nghttp2-1.63.0.tar.xz 1606480 BLAKE2B 8c4158b8855b3b4b0a576f5cc894f77f88bab
 EBUILD nghttp2-1.61.0.ebuild 1816 BLAKE2B 53ee685bca4dd3040979ecae97195b30caec91d09ddd91b0235de955b7848192bdc3c26c6d8d4efd3e5011ff5f0d669c5a7e403925432393c926d976aea6ee05 SHA512 8683d54a28e42d8f5d5b2e25ee360d4a7f2e9ada858afac520c943ec93934971108edf2e3051ee48dd2fa603fe00e95411ab84bc4cfdd8d9ceea9ba30c1320cb
 EBUILD nghttp2-1.62.0.ebuild 1824 BLAKE2B fb8c4290e0ab6644f18a426939b7cd7414df5485e1a0a5266ad738c9a9e850f93112c3b02c468a851b6cb6dd037ab7b181f932f40df5105fe52037b95fd1e7b4 SHA512 d4000103a106b619f1dddc9d8e0327e856219254bbf5a12c985ebc1c3b78d5895720eedbaa511cb108a8479698ba45a89973ef0c12bf3edeb59f82757fff35c3
 EBUILD nghttp2-1.62.1.ebuild 1817 BLAKE2B df18472dafebfd0ca64a248b7927e3c47cd1f8e1f743a7c30ed599ed5ade98ed8c43eec5d129225416e308d87f80eccf79b705fa2ed59f4099404eeb035cb9b5 SHA512 97fbe7b545dfafc6e6fafbacee1cd4f82fe3e17b895a5fb052062b009de59073f0291489ffec7a0776d6c7c88ed402ceb4a0d7adec13c8a48ce1ec72c34402ec
-EBUILD nghttp2-1.63.0.ebuild 1824 BLAKE2B fb8c4290e0ab6644f18a426939b7cd7414df5485e1a0a5266ad738c9a9e850f93112c3b02c468a851b6cb6dd037ab7b181f932f40df5105fe52037b95fd1e7b4 SHA512 d4000103a106b619f1dddc9d8e0327e856219254bbf5a12c985ebc1c3b78d5895720eedbaa511cb108a8479698ba45a89973ef0c12bf3edeb59f82757fff35c3
+EBUILD nghttp2-1.63.0.ebuild 1869 BLAKE2B 08b5b903ed8440379509222d16fc8f6267a1305d0ae2bcfcd5aa6b037e9ea197d389ffe2a71d2e00f146fc8dd39986b2d1d52ab1d6936fd91f3e73d60375811e SHA512 fb915a43110399a8eaccf5731df8153670c148d4c99d18bb9741680e5f39a03975ee3bcd48ba8684012ac89a5e9694d17b0a9120eb369e7720eb8181aebe1d13
 EBUILD nghttp2-9999.ebuild 1607 BLAKE2B 86247f2c6086da22f6d506e8e31c63d558aa45276d2deb202ca515c35034419829be8b6fef0be10b15367b6880ee35f7b62cae6424ecf6c7ae2cac90b090f3bb SHA512 e30a674093644da312f76a7ce8c25ae468c95bbf2e3b69c8618cb21b3852799dfeb674007ae5694d77de46c093228f97c517fcc23e9791fd42c708e55431114e
 MISC metadata.xml 553 BLAKE2B 694d0da32dab7f6eebd3b83a12b490b62d262de96e2bbb5c5822befbac792bc560cfe21c194d83d1afabf725967e0508c65057c8382904353abb0219d5ff3338 SHA512 4bce2e01c0b64eee279fc8a425393acf63e859a8b63346ddb2c5486d913bc58d0485d4c7fd6663bec88b070f21b6c9bbfd28e5775dbcbee02248e631610becd0
diff --git a/net-libs/nghttp2/files/nghttp2-1.63.0-cares.patch b/net-libs/nghttp2/files/nghttp2-1.63.0-cares.patch
new file mode 100644
index 000000000000..ed5286673211
--- /dev/null
+++ b/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 <tatsuhiro.t@gmail.com>
+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/net-libs/nghttp2/nghttp2-1.63.0.ebuild b/net-libs/nghttp2/nghttp2-1.63.0.ebuild
index 040b77645d76..54c2599e4f59 100644
--- a/net-libs/nghttp2/nghttp2-1.63.0.ebuild
+++ b/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