gentoo auto-resync : 08:10:2023 - 06:02:21

4 files changed, 93 insertions, 2 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index cc9b28216031..89aaf6e871c8 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/c-ares/Manifest b/net-dns/c-ares/Manifest
index 56cee9bfdcd0..a95d0d91f026 100644
--- a/net-dns/c-ares/Manifest
+++ b/net-dns/c-ares/Manifest
@@ -1,4 +1,7 @@
 DIST c-ares-1.19.1.tar.gz 1579100 BLAKE2B 4b6c9593edb1a91ab76d54ddacb1cd5d67006d5e628ea1f3289f54e9360be32abeb5d8fc7d23e193feab3e7928e8efde82757eb12fe217dc92ed0d9132bedf5d SHA512 466a94efda626e815a6ef7a890637056339f883d549ea6055e289fd8cd2391130e5682c905c0fb3bd7e955af7f6deb793562c170eb0ee066a4a62085a82ba470
 DIST c-ares-1.19.1.tar.gz.asc 488 BLAKE2B 9c47d7b3e67d9a2bd1e332912d21d20ca591fc34f81707c18a4615ea14ba2da00146d1998250a5f4dd2a0b1c04f9bd2013d4940ac734674c0bdff6815985e19d SHA512 1b204ab1a667af1326be4b7c62c0919aacd447a2e00efea4b8ef2ec9f2b13ffb236a836ff8953b0b3359727faf3fb8cfcd71d0b06a0e533a09f9e9ea66024f4e
-EBUILD c-ares-1.19.1.ebuild 1891 BLAKE2B efa1fa27234f2d233eb492e1f9c2a06d99e5101e3e4a03409d35ba5c53f6561ae16e70e2e6076281fd7a9cb587be018898b84cf69a2f65979b55285ed8cec463 SHA512 5fc6462e41be2fd151aa0dbc8c5b43ec80e1003998f2d1c956037d529e63671135c7564059d3a3eaeb475c0811a9891a767c54499f620411284047c9bfc718eb
+DIST c-ares-1.20.0.tar.gz 1599257 BLAKE2B 7be14be28fac55857dd09dcd63624c87eea883181ea11bc6623fb091a2ab60bd940ff285d9f6e58c7f936b52af61ac5e1c4150e090feae09edf7e411c869b6c5 SHA512 3f7e9c857e91bb35052b335f0e7348cbe336ce458c913803dac0f26c5e1386eff83cbd987160db3a23c0227c479b74706ce6864b322b9a3396039a2093ae33b1
+DIST c-ares-1.20.0.tar.gz.asc 488 BLAKE2B e02bca0b43774bd2dfac5216f822e30dce2463858298921f2e6c0d189b421861a2072664b00a6e5f39912d641387913d5923e98761005a23a0994fd61a47c709 SHA512 096e994b9045dc23f2dee32bdac6159d88f4d783d7ca21d1c8f58ece5a898ae3720616261d3aa67a045730afa938916676231b3956d3e885902bc96dd778b2b8
+EBUILD c-ares-1.19.1.ebuild 1963 BLAKE2B e0917199e623019cb9d11014cd81f6d79f880687b07ab04779e1b37fbf4639d3218c9f33789e449de82b34dfb7deff3a5ffc46e9a2fa6dac74f95c9604886c6a SHA512 39aa552cf9287960b528e145bd22a523fda1b915afe92ec335b3afe947a67a07f15e65213ee125f81298d80541324b06ea7d9db5d269b1f7bc21270bcc136c9c
+EBUILD c-ares-1.20.0.ebuild 2254 BLAKE2B 1c97c21a3876ce1f1f286cfa431d4a2d86a38fce0d993d94670a7f3521c457d92084cdbe8bb5cb669a4b323eca1f753a652b7d538a02fbc329b5c3394e5896c0 SHA512 8572fde02897ef4c25d3c82c0e38cdc9c6e5c2440a8f46232aeb8b1155f5a3bcc1e2b7b72d1be3d3b51a5b39862e4dfb615d35cd2e961842da88698216a5ee9c
 MISC metadata.xml 402 BLAKE2B ab03bca92ec4073f5a877993558552136f0ae673f98619aa1f30eb94b6d8f2103b1cf77d23a9f2b3d56ee33af23d626ee230e480a3e3e0bc174df879082466bd SHA512 e02d13db5d10b1aaaae5680247a6b47610dda28a13b7754d2b97f08a760ce732957c96fb6e88ce7fd2076bfec275e72bfbb3dec802940f0159122364ab21acda
diff --git a/net-dns/c-ares/c-ares-1.19.1.ebuild b/net-dns/c-ares/c-ares-1.19.1.ebuild
index 760debb0dc93..086b6b092f5c 100644
--- a/net-dns/c-ares/c-ares-1.19.1.ebuild
+++ b/net-dns/c-ares/c-ares-1.19.1.ebuild
@@ -13,7 +13,8 @@ SRC_URI="
 	verify-sig? ( https://c-ares.org/download/${P}.tar.gz.asc )
 "
 
-LICENSE="MIT"
+# ISC for lib/{bitncmp.c,inet_ntop.c,inet_net_pton.c} (bug #912405)
+LICENSE="MIT ISC"
 # Subslot = SONAME of libcares.so.2
 SLOT="0/2"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
diff --git a/net-dns/c-ares/c-ares-1.20.0.ebuild b/net-dns/c-ares/c-ares-1.20.0.ebuild
new file mode 100644
index 000000000000..7e6b1c74e94c
--- /dev/null
+++ b/net-dns/c-ares/c-ares-1.20.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc
+inherit edo multilib-minimal verify-sig
+
+DESCRIPTION="C library that resolves names asynchronously"
+HOMEPAGE="https://c-ares.org/"
+SRC_URI="
+	https://c-ares.org/download/${P}.tar.gz
+	verify-sig? ( https://c-ares.org/download/${P}.tar.gz.asc )
+"
+
+# ISC for lib/{bitncmp.c,inet_ntop.c,inet_net_pton.c} (bug #912405)
+LICENSE="MIT ISC"
+# Subslot = SONAME of libcares.so.2
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-danielstenberg )"
+
+DOCS=( AUTHORS CHANGES NEWS README.md RELEASE-NOTES TODO )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ares_build.h
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# Checking for obsolete headers
+	malloc
+	calloc
+	free
+
+	# Non-existent on Linux
+	closesocket
+	CloseSocket
+	ioctlsocket
+	bitncmp
+)
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-nonblocking
+		--enable-symbol-hiding
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+	)
+
+	# Needed for running unit tests only
+	# Violates sandbox and tests pass fine without
+	export ax_cv_uts_namespace=no
+	export ax_cv_user_namespace=no
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	cd "${BUILD_DIR}"/test || die
+
+	# We're skipping the "real" network tests with the filter
+	# see https://github.com/c-ares/c-ares/tree/main/test
+	local network_tests=(
+		# Most live tests have Live in the name
+		*Live*
+		# These don't but are still in ares-test-live.cc => live
+		*GetTCPSock*
+		*TimeoutValue*
+		*GetSock*
+		*GetSock_virtualized*
+		*VerifySocketFunctionCallback*
+		# Seems flaky, even run manually?
+		*MockUDPMaxQueriesTest.GetHostByNameParallelLookups*
+	)
+
+	# The format for disabling test1, test2, and test3 looks like:
+	# -test1:test2:test3
+	edo ./arestest --gtest_filter=-$(echo $(IFS=:; echo "${network_tests[*]}"))
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+}