8 files changed, 201 insertions, 6 deletions
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 6bd1afdba529..1a1d29bca3d6 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 917a69e581f6..a54985e9be0a 100644
--- a/net-dns/c-ares/Manifest
+++ b/net-dns/c-ares/Manifest
@@ -8,9 +8,12 @@ DIST c-ares-1.32.0.tar.gz 1021855 BLAKE2B b60c924581ba7db1d87350929d22b5e1568448
 DIST c-ares-1.32.0.tar.gz.asc 228 BLAKE2B d9cf726e42d79ccdaeca2aafc028c1d03aa56acd1cf03b118070968a31655046a3d609e8ea529f03465341d6decaa7f8eace4310487e7028e3a1ad355d25fa4c SHA512 7554b37e470a57ad0175050c1966e1b72bf67791aa860b113a66688ac28e525b93a633a472dd43c8a16bddb366e918b202760efab5ab311c4b6ee63e72869552
 DIST c-ares-1.32.1.tar.gz 1022052 BLAKE2B 662f15e7f1ae39614f0212745fe7883bbf831da667905e4595e011922b37c95b2037423dde96b0a62122a304d6edd04d36e99e428bdbf8f89d6ff9ecb4cfd712 SHA512 20339b92c5355c01f71a0ab5fe4b823b41ad09269dbdaf4f1567324735d7e90812c9f3f7ce197247be0bd793df35b85aa1747675762a2344e4f506346466d349
 DIST c-ares-1.32.1.tar.gz.asc 228 BLAKE2B d3d44263673c79b2dae594f5a2b3be076528c9c9f3c672e9c5cf3db68eb1b7da6ba74f8ae44605d783440f3bbada4033073e4feeee8ed9833226f76068022dc4 SHA512 3a1dc1f1066bb4d35024ef9e7246c2f630d309a1843e32574f29c07ce01e0461176dd9d53b1a7d2df279959a8b13c10cb4396ee7fafbac534e1b4d44bcefc47a
+DIST c-ares-1.32.2.tar.gz 1026293 BLAKE2B 1acd4d90d0e9d8abcbc49561db8ae2e55295398353896a7ab0108c1ac8718eb08c655dff8aa6c0efa138524805972ac4033d0c49cfcebaeca1a019021073e981 SHA512 f552dbe9cb7f7b28ed05d93ee866a161e77c841453cde3659cb1e0bf6d501894bf5f6b8db308f7397e6ead4b42f34ce17e1c2ef307352de50f2aad25e4610de8
+DIST c-ares-1.32.2.tar.gz.asc 228 BLAKE2B 6a09ff532d1334f994f9e9365ce6074aae4227b27c0a5ef40e441192b6b23c728772278fec7c8c34fc93d20309b04b9e31802d4491dc3e1313818eadbe8a4afc SHA512 385ca9bd72a2131f2eb51c035e50d21d816361872a0db42c6a9dc60a1a3971d464f34c2518c759e01e6c88b5bf100ddaa87862e877187a9b59800070b2bef7af
 EBUILD c-ares-1.28.1.ebuild 2469 BLAKE2B 3602700c7fbd2b32142f10a96cfb6d0918a7a9b532d5c9a3464b8e4f99d64bbe77248211628123fb7d29bff9642ff3f5630b9483d1c2f758dd988bdbf97ba448 SHA512 9a19121ff5d8b4290613e9db043824f5eca2879bd86f9e6a76f479af4190145966484dc60112323d881b7408db668912347346e8981dae021e56f2d8fca6906f
-EBUILD c-ares-1.29.0.ebuild 2477 BLAKE2B af7ef39d916bdf7fff30e9ed176699fb20abc10a51e69e56f9380e9b41d0831880eeecc438476c6d5709fb0d05360899a1c6ce271c65ae2cdd55f3c415778d6d SHA512 daf2ec88ced3df7ce2a112ec0b2c9562681fb11e2bedbceef636fd5d63be0bf0c3a2788a53635a208f93eb87356907058eac0ccbcbbcb4b8284270c1073fe6a6
+EBUILD c-ares-1.29.0.ebuild 2470 BLAKE2B b53ca35edc43d7d4662086f742f0497ce9179dfbdc33ca478991bdb1585e336c7e5a45c880787b3739cfb44df70fa0c2ffb1ccdae0557759b82fed86e134e009 SHA512 9c616b30bdf0efd9d2fa967299442bce009effc0619c0b35497e2f02c56746c2dea74cc7c66820102e6abac45d50eb69fc9327da9212ecf5338803dd9b8e7092
 EBUILD c-ares-1.31.0.ebuild 2499 BLAKE2B a596da04d3c74feb78f2ebbbc82bd8b46668592931b0fa74de8f54e6a9fb093203aa5794d8d9761b2183e2bfdb2046abca927f3f3c2b4a468bf8746c771edafb SHA512 509712dbfdb6ce96e5fdafb73cc8b7d75c0f78b5d6383461230a4555545ad20708dc4c7636d1cacf141b99d3a79d77394a2680960b07bcf261c7b75a43922df1
 EBUILD c-ares-1.32.0.ebuild 2499 BLAKE2B a596da04d3c74feb78f2ebbbc82bd8b46668592931b0fa74de8f54e6a9fb093203aa5794d8d9761b2183e2bfdb2046abca927f3f3c2b4a468bf8746c771edafb SHA512 509712dbfdb6ce96e5fdafb73cc8b7d75c0f78b5d6383461230a4555545ad20708dc4c7636d1cacf141b99d3a79d77394a2680960b07bcf261c7b75a43922df1
 EBUILD c-ares-1.32.1.ebuild 2499 BLAKE2B a596da04d3c74feb78f2ebbbc82bd8b46668592931b0fa74de8f54e6a9fb093203aa5794d8d9761b2183e2bfdb2046abca927f3f3c2b4a468bf8746c771edafb SHA512 509712dbfdb6ce96e5fdafb73cc8b7d75c0f78b5d6383461230a4555545ad20708dc4c7636d1cacf141b99d3a79d77394a2680960b07bcf261c7b75a43922df1
+EBUILD c-ares-1.32.2.ebuild 2499 BLAKE2B a596da04d3c74feb78f2ebbbc82bd8b46668592931b0fa74de8f54e6a9fb093203aa5794d8d9761b2183e2bfdb2046abca927f3f3c2b4a468bf8746c771edafb SHA512 509712dbfdb6ce96e5fdafb73cc8b7d75c0f78b5d6383461230a4555545ad20708dc4c7636d1cacf141b99d3a79d77394a2680960b07bcf261c7b75a43922df1
 MISC metadata.xml 402 BLAKE2B ab03bca92ec4073f5a877993558552136f0ae673f98619aa1f30eb94b6d8f2103b1cf77d23a9f2b3d56ee33af23d626ee230e480a3e3e0bc174df879082466bd SHA512 e02d13db5d10b1aaaae5680247a6b47610dda28a13b7754d2b97f08a760ce732957c96fb6e88ce7fd2076bfec275e72bfbb3dec802940f0159122364ab21acda
diff --git a/net-dns/c-ares/c-ares-1.29.0.ebuild b/net-dns/c-ares/c-ares-1.29.0.ebuild
index f57d48f92bcd..2e6982838c3e 100644
--- a/net-dns/c-ares/c-ares-1.29.0.ebuild
+++ b/net-dns/c-ares/c-ares-1.29.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 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"
+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 )"
 
diff --git a/net-dns/c-ares/c-ares-1.32.2.ebuild b/net-dns/c-ares/c-ares-1.32.2.ebuild
new file mode 100644
index 000000000000..d6ad901bd330
--- /dev/null
+++ b/net-dns/c-ares/c-ares-1.32.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Both Daniel and Brad are listed as possible signers on the homepage
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradhouse.asc
+inherit edo multilib-minimal verify-sig
+
+DESCRIPTION="C library that resolves names asynchronously"
+HOMEPAGE="https://c-ares.org/"
+SRC_URI="
+	https://github.com/c-ares/c-ares/releases/download/v${PV}/${P}.tar.gz
+	verify-sig? ( https://github.com/c-ares/c-ares/releases/download/v${PV}/${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="
+	test? ( dev-cpp/gtest )
+	verify-sig? ( sec-keys/openpgp-keys-bradhouse )
+"
+
+DOCS=( AUTHORS README.md RELEASE-NOTES.md )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ares_build.h
+)
+
+A__QA_CONFIG_IMPL_DECL_SKIP=(
+	# Checking for obsolete headers
+	malloc
+	calloc
+	free
+
+	# Non-existent on Linux
+	closesocket
+	CloseSocket
+	ioctlsocket
+	bitncmp
+	ConvertInterfaceIndexToLuid
+	ConvertInterfaceLuidToNameA
+)
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--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
+		# https://github.com/c-ares/c-ares/commit/9e542a8839f81c990bb0dff14beeaf9aa6bcc18d
+		*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
+}
diff --git a/net-dns/hash-slinger/Manifest b/net-dns/hash-slinger/Manifest
index 6ef29569e6b6..96dba495f2fd 100644
--- a/net-dns/hash-slinger/Manifest
+++ b/net-dns/hash-slinger/Manifest
@@ -1,3 +1,5 @@
-DIST hash-slinger-3.2.tar.gz 38376 BLAKE2B 8c89f9a372818166c862d97354a60dddc2795c70f23b39225ad0fc3a2657cc5e048dca228dc004db0240fcf80e74bc799528d3459a65e6de347a493df5abf7b3 SHA512 01a25b3bc00bd9cd86c448f087c48ad04248a5a8755c2f154272b833efdce058a1fc62ea3f5cc6e9ff35180754b3e44db03c4e4888fd9051b749eff5fc8c3110
-EBUILD hash-slinger-3.2-r1.ebuild 1142 BLAKE2B 04c954c1c3fdc2174462864f7d356b7ba6c4941dd4da64e015622212dccb9147c31d6839b17d86c74447054124bc1ba1e956f031dea31abeb47a8121c53f6eb8 SHA512 28e3425334bae01dace3c9cf8f8f50e62899262afc15f6c7945bfe16a3067ff38aa0f7a66983a9cf90864c8d8bdf05e440528bf2a2fc7843d452c019ef9c75dd
+AUX hash-slinger-3.3-fix-tlsa-record-generation.patch 1446 BLAKE2B cb0a435b41048aa07ceefe7138590211c36aae4bb5af3aad4e9c2a51246a24a8b404ee8a69eb2ae780ffe8c2b8d2648c4be73353bbc13acbdd7460648a8dfbcc SHA512 81cd9eca58b513ad77d49252c5679fd0543dc0da386cbe930cc65d31876c7b171813dc4b9c2abe3934ed335873246c32782181804a1adcb50df5af18c7506e80
+AUX hash-slinger-3.3-python-3.12.patch 2442 BLAKE2B 2aaadbb02c04901d4071e7627f7090e3a2ade9b7571587ac7a6032a6c4cdc26bad356a9dc70b21a0597ab0c1f19a5c390ea1bf2fd030709dd03e3f1f56a324aa SHA512 5dfd50778a1464bc6a8284efaebd6980f9ab21feed70cdd54bbd932d9c98bc14f45d2941c0a295e9c729a6bd6b1fd8b3e1ff85030f2a115f61027067bd4a88ac
+DIST hash-slinger-3.3.tar.gz 38597 BLAKE2B 237affa3f933d3dbd1dca3bc4f927268c15d10eed16c18aae68906f1fe6511eda48283f76da851d70535139bc880074951a1ab4c6be92bd27e32c38e374ce044 SHA512 ba59771d32a93f500b61beab1d44e6edf94965c1a7cb30708e4722fe7e6d97a884ccd0e16c9058c29b174a710c13d562b1b6dfc15edc7440692494744392a52e
+EBUILD hash-slinger-3.3.ebuild 1257 BLAKE2B 0f9dbfcf9e22645245bc6c46c97c6538f8f54e388cfd572e670a6750b1370d933b231ab4d667f9ea909bc5ea83e294c5598dc881eeac6d74a86baa8af4305afc SHA512 433096e4863ec701cbeb2d91fdc9aee945ae054fe3872e37a14e7a4e4ab0bd4fee3ce31ef70e541e521b0e5b7c627dc709c014a360e0456e0c95304ab59a4f39
 MISC metadata.xml 598 BLAKE2B dfe22fbc9dec4a1bf906a13c184945f42c956ba1f5167a1a3ca744bf7f482c9fb7a85cebfeec71d4376bd0acf89660c6dba13399325d3c123f967c1a21c7848a SHA512 954cd85c0b50c26483dcb000c7eeb8f1fa59f5c4c2e66114ba86a634f48325e273fa01ab7a76e71ba2d4cb9d269f7934429d56aa5eef8e673cea21fc4411f59d
diff --git a/net-dns/hash-slinger/files/hash-slinger-3.3-fix-tlsa-record-generation.patch b/net-dns/hash-slinger/files/hash-slinger-3.3-fix-tlsa-record-generation.patch
new file mode 100644
index 000000000000..36b8d60d3057
--- /dev/null
+++ b/net-dns/hash-slinger/files/hash-slinger-3.3-fix-tlsa-record-generation.patch
@@ -0,0 +1,35 @@
+From 0bb0dba91c51d367d9a37297f13e07f33c01bfdc Mon Sep 17 00:00:00 2001
+From: anarcat <anarcat@users.noreply.github.com>
+Date: Thu, 5 Oct 2023 02:10:32 -0400
+Subject: [PATCH] fix generic TLSA record generation (#46)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It seems like the calculation for the TLSA record never really worked,
+as we're doing float division here on the `len()` field. In our case,
+that field returned `35.0` which is not valid in our environment.
+
+Doing an integer division gives the correct result in most cases, I
+believe.
+
+Closes: #45
+
+Co-authored-by: Jérôme Charaoui <jerome@riseup.net>
+---
+ tlsa | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tlsa b/tlsa
+index cea7230..ec97150 100755
+--- a/tlsa
++++ b/tlsa
+@@ -513,7 +513,7 @@ class TLSARecord:
+ 	def getRecord(self, generic=False):
+ 		"""Returns the RR string of this TLSARecord, either in rfc (default) or generic format"""
+ 		if generic:
+-			return '%s IN TYPE52 \# %s %s%s%s%s' % (self.name, (len(self.cert)/2)+3 , self._toHex(self.usage), self._toHex(self.selector), self._toHex(self.mtype), self.cert)
++			return '%s IN TYPE52 \# %s %s%s%s%s' % (self.name, (len(self.cert)//2)+3 , self._toHex(self.usage), self._toHex(self.selector), self._toHex(self.mtype), self.cert)
+ 		return '%s IN TLSA %s %s %s %s' % (self.name, self.usage, self.selector, self.mtype, self.cert)
+ 
+ 	def _toHex(self, val):
diff --git a/net-dns/hash-slinger/files/hash-slinger-3.3-python-3.12.patch b/net-dns/hash-slinger/files/hash-slinger-3.3-python-3.12.patch
new file mode 100644
index 000000000000..d4b1eacc94e6
--- /dev/null
+++ b/net-dns/hash-slinger/files/hash-slinger-3.3-python-3.12.patch
@@ -0,0 +1,57 @@
+From e04d8262f1409725afc8f71720b77083fb43c525 Mon Sep 17 00:00:00 2001
+From: Hoggins! <hoggins@radiom.fr>
+Date: Tue, 16 Jul 2024 23:52:39 +0200
+Subject: [PATCH] Python3.12 compains with a "SyntaxWarning: invalid escape
+ sequence" when regexes are not used with raw strings
+
+---
+ tlsa | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/tlsa b/tlsa
+index ec97150..d06bd49 100755
+--- a/tlsa
++++ b/tlsa
+@@ -495,7 +495,7 @@ class TLSARecord:
+ 	"""When instanciated, this class contains all the fields of a TLSA record.
+ 	"""
+ 	def __init__(self, name, usage, selector, mtype, cert):
+-		"""name is the name of the RR in the format: /^(_\d{1,5}|\*)\._(tcp|udp|sctp)\.([a-z0-9]*\.){2,}$/
++		r"""name is the name of the RR in the format: /^(_\d{1,5}|\*)\._(tcp|udp|sctp)\.([a-z0-9]*\.){2,}$/
+ 		usage, selector and mtype should be an integer
+ 		cert should be a hexidecimal string representing the certificate to be matched field
+ 		"""
+@@ -513,7 +513,7 @@ class TLSARecord:
+ 	def getRecord(self, generic=False):
+ 		"""Returns the RR string of this TLSARecord, either in rfc (default) or generic format"""
+ 		if generic:
+-			return '%s IN TYPE52 \# %s %s%s%s%s' % (self.name, (len(self.cert)//2)+3 , self._toHex(self.usage), self._toHex(self.selector), self._toHex(self.mtype), self.cert)
++			return r'%s IN TYPE52 \# %s %s%s%s%s' % (self.name, (len(self.cert)//2)+3 , self._toHex(self.usage), self._toHex(self.selector), self._toHex(self.mtype), self.cert)
+ 		return '%s IN TLSA %s %s %s %s' % (self.name, self.usage, self.selector, self.mtype, self.cert)
+ 
+ 	def _toHex(self, val):
+@@ -554,20 +554,20 @@ class TLSARecord:
+ 
+ 	def isNameValid(self):
+ 		"""Check if the name if in the correct format"""
+-		if not re.match('^(_\d{1,5}|\*)\._(tcp|udp|sctp)\.([-a-z0-9]*\.){2,}$', self.name):
++		if not re.match(r'^(_\d{1,5}|\*)\._(tcp|udp|sctp)\.([-a-z0-9]*\.){2,}$', self.name):
+ 			return False
+ 		return True
+ 
+ 	def getProtocol(self):
+ 		"""Returns the protocol based on the name"""
+-		return re.split('\.', self.name)[1][1:]
++		return re.split(r'\.', self.name)[1][1:]
+ 
+ 	def getPort(self):
+ 		"""Returns the port based on the name"""
+-		if re.split('\.', self.name)[0][0] == '*':
++		if re.split(r'\.', self.name)[0][0] == '*':
+ 			return '*'
+ 		else:
+-			return re.split('\.', self.name)[0][1:]
++			return re.split(r'\.', self.name)[0][1:]
+ 
+ class ARecord:
+ 	"""An object representing an A Record (IPv4 address)"""
diff --git a/net-dns/hash-slinger/hash-slinger-3.2-r1.ebuild b/net-dns/hash-slinger/hash-slinger-3.3.ebuild
index d4c705076a21..da7e8e7310b8 100644
--- a/net-dns/hash-slinger/hash-slinger-3.2-r1.ebuild
+++ b/net-dns/hash-slinger/hash-slinger-3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit python-single-r1
 
@@ -31,6 +31,11 @@ RDEPEND="
 	ssh? ( virtual/openssh )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-3.3-fix-tlsa-record-generation.patch"
+	"${FILESDIR}/${PN}-3.3-python-3.12.patch"
+)
+
 src_install() {
 	local tools tool