gentoo auto-resync : 04:01:2025 - 06:31:29

4 files changed, 109 insertions, 5 deletions

diff --git a/net-libs/ngtcp2/Manifest b/net-libs/ngtcp2/Manifest
index d10a366bb144..62a7cdf51edf 100644
--- a/net-libs/ngtcp2/Manifest
+++ b/net-libs/ngtcp2/Manifest
@@ -1,7 +1,9 @@
+AUX ngtcp2-1.10.0-gcc15-uninit.patch 1686 BLAKE2B 8122058a83c28c4eae25ed592c60b32bdaaf8259fbc8ee6d50d82da7c6a175b897c5231ba82589e7cd8e45606f1857314c542c52e853b79b816d48262cef5428 SHA512 ae8ef45cf943ca8c73b76407a1fc3548989f536d4944687b37830fbd0a873952364bbd4e51d08cf5c7eb83381bf79b0895f742c63fa829cbdde148aba8e3f700
 AUX ngtcp2-1.10.0-munit-c23.patch 961 BLAKE2B 30f969117b8f8a74747d5c6d466ec9be7b35ef852d5b05d7f2900fdc8867a9859289ccadfe071262f5d45838da3282666f012a581c08640e26d3893d88fe08cb SHA512 815c47f9bcc600de920e81a7630104b0a3875123831b131b7d95fc8a022d4c38a42b0a9681e6cfc941a0bd71093e960b1f608a84df7cf5289c7fad77a2ecc7a0
 DIST ngtcp2-1.10.0.tar.xz 636296 BLAKE2B 21ca85ed0652d9c3721f1a8dcb890bc21ea37bb49095c3fcc418e818462629463f4410e169465ff19960b09e47684e99b9fc713919f114c3ef765cc2d754aadb SHA512 de61f9c2b8135d0d08740215002a3e1688f93825ce6ab6d074ce36569bde0e789d4f1a2abd708773c4ab123c4584e94f0eeee8f7e8ef238891f9bb36be001f9b
 DIST ngtcp2-1.7.0.tar.xz 631072 BLAKE2B 1a1ce134c54974418c0cf0bacc09a770e29cd7c7bfc44a2b5420f3bef3e70502f610bee4e9bb5ed9b87024153aa9390d5a233d2d6e2689166e1079e0e4f52600 SHA512 6efa42d17772fde00d9d0a67f2cbcf0704a8462c7305a5e3f213d1e98c9302a1ceee847081ecef358c7a421db56236e571a1ad9ff7fa5f5037987c5cb14e517d
 EBUILD ngtcp2-1.10.0-r1.ebuild 1465 BLAKE2B bf05b9ed99b701418dd5ab393187dd03964e388531a04405be060ca12187ccdb5169d2c8337f63b2175215bd4f7c8b605d9ab7ac9c24c25e32a5de076bded031 SHA512 38e373966a5cb0d2d0dca6a1d94a561f733e22471df688601936253e5440d4dc64d0e3111f76011466752cf6481d7619015e9dfb4a9cfdbfc76788cab3101a87
+EBUILD ngtcp2-1.10.0-r2.ebuild 1504 BLAKE2B 003c0df1661166cc16f2a574820798c62d6f30213dbda34340c541a2bcf67edb674250958b8234b4835ca06702d2804357bfc6e05ac85b87f776dd61a2869c4b SHA512 7c7ff84469145a9ffb33b68f1c3a1d1dfd928e992ab63ca379a7fc131f30fed58d75e5b748da74790b04fc871f8a13dd496dd5a2e5f02d655eee63fda1fbaca0
 EBUILD ngtcp2-1.7.0-r1.ebuild 1332 BLAKE2B 023b18e726148cf593bdee277a5094dd4539699f96ab814a373e9188fe730603a49f81211ce98a7ffc75cbd7963616e44020055db18c5f37f2ce4f57622f29c5 SHA512 9d83417bd659bccd8cb9b32dfe9154b8cc545d8e9ec509fae5a2607cec8d29557150dabb9534cf46bea0015b3ade1f49e5604926d9bd1d1533137848a9ce6b77
-EBUILD ngtcp2-9999.ebuild 1465 BLAKE2B bf05b9ed99b701418dd5ab393187dd03964e388531a04405be060ca12187ccdb5169d2c8337f63b2175215bd4f7c8b605d9ab7ac9c24c25e32a5de076bded031 SHA512 38e373966a5cb0d2d0dca6a1d94a561f733e22471df688601936253e5440d4dc64d0e3111f76011466752cf6481d7619015e9dfb4a9cfdbfc76788cab3101a87
+EBUILD ngtcp2-9999.ebuild 1408 BLAKE2B abe1b71efcc67cf088ef4f50faa625485b8445f08866cbd08abddbcfc46c90d47de62ff57162c088c7e665a70b1106751064ca2928b3cca26883ff391bd42859 SHA512 5136bcde44dd0a5ba3037ce7d48ad009a614f78592f01755c09633934c7cbc44db1052d978c93e437bf0279df8c8326c4fb3e76e4ea5d2b69468ce5d6308a017
 MISC metadata.xml 445 BLAKE2B d27a34331ff5bd772b6228ff26ca20440a3bf932ccc88720a33409f329d41165d5fad6750221bae1fed3386d6e8244458c1c5073df8b36251156598e599bb15e SHA512 c09f5ac61f3c3b16bda0f12c2f31188aaaba469fbfde31e71d4f9834609b4c8d0cb7152a688934ba0b90c491da4e8b707e6ad5e54d5965b4109cbdc29ee0a4a2
diff --git a/net-libs/ngtcp2/files/ngtcp2-1.10.0-gcc15-uninit.patch b/net-libs/ngtcp2/files/ngtcp2-1.10.0-gcc15-uninit.patch
new file mode 100644
index 000000000000..7ce0cf2b6c3c
--- /dev/null
+++ b/net-libs/ngtcp2/files/ngtcp2-1.10.0-gcc15-uninit.patch
@@ -0,0 +1,46 @@
+https://bugs.gentoo.org/947300
+https://github.com/ngtcp2/ngtcp2/pull/1464
+https://github.com/ngtcp2/ngtcp2/commit/60ab2b73aa02e6c99597b975724c6b58008c4869
+https://github.com/ngtcp2/ngtcp2/commit/416698347d60968eba635182dfdedc44d1aa7c3b
+
+From 60ab2b73aa02e6c99597b975724c6b58008c4869 Mon Sep 17 00:00:00 2001
+From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
+Date: Fri, 3 Jan 2025 10:05:55 +0900
+Subject: [PATCH] tests: Fix uninitialized variable reference
+
+--- a/tests/ngtcp2_transport_params_test.c
++++ b/tests/ngtcp2_transport_params_test.c
+@@ -419,11 +419,16 @@ void test_ngtcp2_transport_params_convert_to_latest(void) {
+   ngtcp2_cid rcid, scid, dcid;
+   uint8_t available_versions[sizeof(uint32_t) * 3];
+   ngtcp2_sockaddr_in6 *sa_in6;
++  size_t i;
+ 
+   rcid_init(&rcid);
+   scid_init(&scid);
+   dcid_init(&dcid);
+ 
++  for (i = 0; i < sizeof(available_versions); i += sizeof(uint32_t)) {
++    ngtcp2_put_uint32be(&available_versions[i], (uint32_t)(0xff000000u + i));
++  }
++
+   ngtcp2_transport_params_default_versioned(NGTCP2_TRANSPORT_PARAMS_V1,
+                                             &srcbuf);
+ 
+
+From 416698347d60968eba635182dfdedc44d1aa7c3b Mon Sep 17 00:00:00 2001
+From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
+Date: Fri, 3 Jan 2025 10:13:56 +0900
+Subject: [PATCH] Fix uninitialized connection close frame_type
+
+--- a/lib/ngtcp2_conn.c
++++ b/lib/ngtcp2_conn.c
+@@ -13765,6 +13765,7 @@ ngtcp2_ssize ngtcp2_pkt_write_connection_close(
+ 
+   fr.type = NGTCP2_FRAME_CONNECTION_CLOSE;
+   fr.connection_close.error_code = error_code;
++  fr.connection_close.frame_type = 0;
+   fr.connection_close.reasonlen = reasonlen;
+   fr.connection_close.reason = (uint8_t *)reason;
+ 
+
diff --git a/net-libs/ngtcp2/ngtcp2-1.10.0-r2.ebuild b/net-libs/ngtcp2/ngtcp2-1.10.0-r2.ebuild
new file mode 100644
index 000000000000..b88f76b1fbc3
--- /dev/null
+++ b/net-libs/ngtcp2/ngtcp2-1.10.0-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Implementation of the IETF QUIC Protocol"
+HOMEPAGE="https://github.com/ngtcp2/ngtcp2/"
+
+LICENSE="MIT"
+SLOT="0/0"
+IUSE="+gnutls openssl +ssl static-libs test"
+# Without static-libs, src_test just won't run any tests and "pass".
+REQUIRED_USE="ssl? ( || ( gnutls openssl ) ) test? ( static-libs )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.7.2:=[${MULTILIB_USEDEP}] )
+		openssl? ( >=dev-libs/openssl-1.1.1:=[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )
+"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10.0-munit-c23.patch
+	"${FILESDIR}"/${P}-gcc15-uninit.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_STATIC_LIB=$(usex static-libs)
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_OPENSSL=$(usex openssl)
+		-DENABLE_BORINGSSL=OFF
+		-DENABLE_PICOTLS=OFF
+		-DENABLE_WOLFSSL=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	cmake_build check
+}
diff --git a/net-libs/ngtcp2/ngtcp2-9999.ebuild b/net-libs/ngtcp2/ngtcp2-9999.ebuild
index f59f2eb6f3a2..0f374b9abbda 100644
--- a/net-libs/ngtcp2/ngtcp2-9999.ebuild
+++ b/net-libs/ngtcp2/ngtcp2-9999.ebuild
@@ -35,10 +35,6 @@ DEPEND="
 "
 RESTRICT="!test? ( test )"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10.0-munit-c23.patch
-)
-
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DENABLE_STATIC_LIB=$(usex static-libs)