gentoo auto-resync : 06:02:2024 - 11:42:15

6 files changed, 106 insertions, 215 deletions

diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index 283a78e16901..6a94e675d995 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,11 +1,8 @@
 AUX ldns-1.8.1-pkgconfig.patch 273 BLAKE2B 8605665fa76e2493efa4d773742e84a7b1df81cec4b8695a00c3eb4e10b915b4fd4d483f40fa61d14f7303d7f344e3602daecad42491c4de81a9bb0a03e4f896 SHA512 017e0ba07ab348a809852f567ad6c9fc5c0dd3ede9fcc24c53da96d2bfaa2e8e5662eb566818813c19ee19799c4ad6b11e8f5007d1f1fac8b5eb3b05424ec5a0
 AUX ldns-1.8.3-configure-strict.patch 3873 BLAKE2B bf4ae24f786a34e43833d1ce1b7650db32f49ce272340c26887d920b20a5a951a5e4ee1a1d8e8efea96e60ae1e009f7261402fc59a6283dba893182782c0fd14 SHA512 a6bd3fc5a38ad7d0cd95cea36f61ff3e40978c953aa723f769442e43aa829ca8787f33ad086254af391b1b68a99402a61dcbcb3f9e86c8c17357a88ce0f082f5
 AUX ldns-1.8.3-docs.patch 3940 BLAKE2B bf0823b32dcf5935fdccee131aa52f597a229c8df9575e3018cc733eba050c56ebc79049d064775fc599ca28e92ee5da67d784209faf8a9d30ebd72586cc1b7e SHA512 88ea628be7bd188e7ed95a5d41f8ca39d1e8d576bfd5ea59cdb3f1f4319fbb435889e50aa150a50ef8ee4a4e572d2352432aab50832769b6729ad588e7b67c86
-DIST ldns-1.8.0.tar.gz 1283220 BLAKE2B f916a8c76d788ac7c52aea8bfe675ad4c614a0c6fb011b61f5a27d4a5dc1a2adb33b5c6992b4813b3758c9b7cceab1c77f8c1d66baaa4de993f23888bce69df1 SHA512 54b306160bb7fd76d181f4be0a13134017f6f98ae96e0c954409f31f262e9dbe611c4b76fb6dff47bb6155c652ed8d026b52a50dfcf611e54d9c204b314c4fd6
-DIST ldns-1.8.1.tar.gz 1284971 BLAKE2B ae01ef32571fe3996ddd41f911815239abb704ea1dee479fa612bfd701ca369222ab709923f014662248988cb4452a75bc5debad47d2b0386dc59169b353e6a3 SHA512 600f8e221716742caf439a425008827aef1814fc1d9e751f8f492d0235ff45ca48df90abba17979bac9f4485947bb9fe8102924d9cebe6cb56d5b788e1c4bd14
+AUX ldns-1.8.3-swig-4.2.0.patch 2935 BLAKE2B 15626ba3f3835bc9e3f86a639177eb6ceb8acb23cccd273dab771f7a5faad72312585da0360d19da0bc62440bbc930279ae56a26d9f2d66d4a6d070e0071d066 SHA512 3de12a7524e0c090a4f5d5e9a6770de811eadd9ac492b674ccd706cd826d13f1adf5c1b4474a11ba1d449562fed34b27ad4800e43da09d3c74ae267dc4a01e82
 DIST ldns-1.8.3.tar.gz 1299856 BLAKE2B 2250445da3beec76c96fbb5cbc00f8d6a5bb6ed5867da7f23511d46ac73d6101303eb6ad85def426b7f9287f6a629a95117bcfa6eb46b775d07ed84048162c7f SHA512 c318747bd975ade389d048680b80495fb083b46507d8dcea7d4d42c75823f56a35b438dcc5320803d39583e5a1e515a51686f7f9010c061a6e8199e1a5505ae9
-EBUILD ldns-1.8.0-r4.ebuild 2971 BLAKE2B d2b95b97029f2aa651c2686fbe880fcf78ee1bca76065da6c6b215fa89d6fe0c6c31face129a85ff60669c9baaf2d578f0f9485642ea1c6d8dd15df3ed8d593e SHA512 624610ce9274dcb8ed81e4645d4571af67bce77f623245fc0c212c395d58762b3e091b2532ecf51db96716fea94799a04e4c026a2cbe86c2040c37cd48cf673a
-EBUILD ldns-1.8.1.ebuild 1843 BLAKE2B e8a701f4a4b3928fa7df6018bd263a0fe64184278badfb640f87ef2e1b5f4c1a2449866080f5849561429fe0164db103d014c9d6a2295d37502584bee4564d4d SHA512 0a76c332c61e0adc75d556714fec3ce7cc1ed2f43832a8bb373463b7c4e6e99a4825c6743a58e8a6acc35d2b367d3263e81583da381e0e7d9b1be13c7ec8dfa4
 EBUILD ldns-1.8.3-r1.ebuild 1943 BLAKE2B d37692bced21132fb8da0c52219641fe340a10bc8e63c1e756fa04765fb6fa5bc621973f029c3c291bc296daec6e322ea0dc33896e59dd0f324ddbeae6f31b16 SHA512 7a612d4b5a1dbbb833059529905b94ec272f0bde71fe60295ab54a52be37f17909fcaa5e0752de6f5e453ef568c07cda32d4bfa453caaecfad55f9068dc793c5
-EBUILD ldns-1.8.3.ebuild 1950 BLAKE2B 84a5d557237f3125a7a20962e3c80b5c4a10656318e8e0ef32e9ec6ac404cbcc7d10d0b8b22950743a8fa7a37a364123d99a24d0bbaba2caae3af134c08d7a35 SHA512 0c116e51495bc8e54869e38da1a9e5865f32ebc0fd377873ae1acb62f8efac873554240ba68168eda0c9c5dc3b90877a1bce2f3995c96daa468fa4dfae103b3d
-MISC metadata.xml 933 BLAKE2B 4382e8d75f379211e781a0309b483105cbdba740cbd473b29d6b892351d3a5d270487c759ba7a1f5bcad448222cb1c24ef8257cd089c54ce9df0523ff708888a SHA512 395c02c568874e3d22434431f5e72dd98a647455ec0587723cb447c4d5a2fb468256bb35aff2c74b8255203d21f4d844f5a4ad426037eeb907d67ffedeb6d74e
+EBUILD ldns-1.8.3-r2.ebuild 1996 BLAKE2B e5dbca6c36a8a230a51482b1c1b7db3b25d27ab51416fb9350d8d8d61fedbc299289c36b3415c9238e386f16b4fc8ff640367f03554d945bfce9a2fd81eae32f SHA512 976894604aed6d47baabceed8a0185312daa589ce9ec7b433dff899462b181fdc6120c4cef490e03c78ca445cb3ba51d43d1dd92d5c34bb885f23437c6b369b0
+MISC metadata.xml 616 BLAKE2B 17f79a6324d889cc626bb3fceef622a45f112587618bad54422503d7a43914c46a03563f5e0b8d9d170e25c2e77666325607e485d421853359cbae13e7f00b34 SHA512 a764ec840b5dc9cc90c5952b93e2e226914c9eaca52f18f0c4f4d7d128bd1b2bc1eea9e699720d37b2c041fb6b01e0b298ac7f000ed72f0a7e0e2dce733febff
diff --git a/net-libs/ldns/files/ldns-1.8.3-swig-4.2.0.patch b/net-libs/ldns/files/ldns-1.8.3-swig-4.2.0.patch
new file mode 100644
index 000000000000..8165371d53bb
--- /dev/null
+++ b/net-libs/ldns/files/ldns-1.8.3-swig-4.2.0.patch
@@ -0,0 +1,101 @@
+https://bugs.gentoo.org/921302
+https://github.com/NLnetLabs/ldns/pull/232
+https://github.com/NLnetLabs/ldns/pull/233
+
+From daf38095763f758c77be538da25c267dc5cb73c8 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Fri, 26 Jan 2024 11:30:39 +0100
+Subject: [PATCH] SWIG_Python_str_AsChar removal in SWIG 4.2.0
+
+The replacement, SWIG_PyUnicode_AsUTF8AndSize, has different
+memory management requirements.
+---
+ contrib/python/ldns_rdf.i | 21 +++++++++++++++++++--
+ 1 file changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/contrib/python/ldns_rdf.i b/contrib/python/ldns_rdf.i
+index 5d7448fd..60daf1a7 100644
+--- a/contrib/python/ldns_rdf.i
++++ b/contrib/python/ldns_rdf.i
+@@ -56,7 +56,11 @@
+  */
+ %typemap(arginit, noblock=1) const ldns_rdf *
+ {
++#if SWIG_VERSION >= 0x040200
++  PyObject *$1_bytes = NULL;
++#else
+   char *$1_str = NULL;
++#endif
+ }
+ 
+ /*
+@@ -66,11 +70,17 @@
+ %typemap(in, noblock=1) const ldns_rdf * (void* argp, $1_ltype tmp = 0, int res)
+ {
+   if (Python_str_Check($input)) {
++    const char *argstr;
++#if SWIG_VERSION >= 0x040200
++    argstr = SWIG_PyUnicode_AsUTF8AndSize($input, NULL, &$1_bytes);
++#else
+     $1_str = SWIG_Python_str_AsChar($input);
+-    if ($1_str == NULL) {
++    argstr = $1_str;
++#endif
++    if (argstr == NULL) {
+       %argument_fail(SWIG_TypeError, "char *", $symname, $argnum);
+     }
+-    tmp = ldns_dname_new_frm_str($1_str);
++    tmp = ldns_dname_new_frm_str(argstr);
+     if (tmp == NULL) {
+       %argument_fail(SWIG_TypeError, "char *", $symname, $argnum);
+     }
+@@ -90,10 +100,17 @@
+  */
+ %typemap(freearg, noblock=1) const ldns_rdf *
+ {
++#if SWIG_VERSION >= 0x040200
++  if ($1_bytes != NULL) {
++    /* Is not NULL only when a conversion form string occurred. */
++    Py_XDECREF($1_bytes);
++  }
++#else
+   if ($1_str != NULL) {
+     /* Is not NULL only when a conversion form string occurred. */
+     SWIG_Python_str_DelForPy3($1_str); /* Is a empty macro for Python < 3. */
+   }
++#endif
+ }
+ 
+ %nodefaultctor ldns_struct_rdf; /* No default constructor. */
+
+From f91f61e10be595a6a46845112aaed7da24551bf9 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Fri, 26 Jan 2024 11:57:03 +0100
+Subject: [PATCH] 32-bit compatibility for Python SWIG bindings
+
+The ssize_t type can be int instead of long, and the pointer
+types are incompatible.
+---
+ contrib/python/ldns.i | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/contrib/python/ldns.i b/contrib/python/ldns.i
+index 881ba5e85..b4a740820 100644
+--- a/contrib/python/ldns.i
++++ b/contrib/python/ldns.i
+@@ -99,12 +99,14 @@
+ %typemap(in, noblock=1) (ssize_t)
+ {
+   int $1_res = 0;
+-  $1_res = SWIG_AsVal_long($input, &$1);
++  long val;
++  $1_res = SWIG_AsVal_long($input, &val);
+   if (!SWIG_IsOK($1_res)) {
+     SWIG_exception_fail(SWIG_ArgError($1_res), "in method '"
+       "$symname" "', argument " "$argnum" " of type '"
+       "$type""'");
+   }
++  $1 = val;
+ }
+ 
+ 
diff --git a/net-libs/ldns/ldns-1.8.0-r4.ebuild b/net-libs/ldns/ldns-1.8.0-r4.ebuild
deleted file mode 100644
index d1d069aba919..000000000000
--- a/net-libs/ldns/ldns-1.8.0-r4.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9,10} )
-inherit python-single-r1 autotools multilib-minimal
-
-DESCRIPTION="A library with the aim to simplify DNS programming in C"
-HOMEPAGE="https://www.nlnetlabs.nl/projects/ldns/"
-SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+dane doc +ecdsa ed25519 ed448 examples gost python static-libs vim-syntax"
-
-# configure will die if ecdsa is enabled and ssl is not
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-COMMON_DEPEND="
-	python? ( ${PYTHON_DEPS} )
-	>=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}]
-	examples? ( net-libs/libpcap )
-"
-DEPEND="${COMMON_DEPEND}
-	python? ( dev-lang/swig )
-	doc? ( app-text/doxygen )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<net-dns/ldns-utils-1.8.0-r2
-"
-
-RESTRICT="test" # 1.6.9 has no test directory
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/ldns-config
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	# >=openssl-1.1.0 required for dane-ta
-	if has_version "<dev-libs/openssl-1.1.0"; then
-		local dane_ta_usage="--disable-dane-ta-usage"
-	else
-		local dane_ta_usage=""
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable gost) \
-		$(use_enable ecdsa) \
-		$(use_enable ed25519) \
-		$(use_enable ed448) \
-		$(use_enable dane) \
-		$(multilib_native_use_with python pyldns) \
-		$(multilib_native_use_with python pyldnsx) \
-		--with-ssl="${EPREFIX}"/usr \
-		--enable-sha2 \
-		$(multilib_native_with drill) \
-		$(multilib_native_use_with examples) \
-		${dane_ta_usage} \
-		--disable-rpath
-}
-
-src_prepare() {
-	default
-	# remove non-existing dependency for target packaging/libldns.pc
-	sed -i 's,$(srcdir)/packaging/libldns.pc.in,,' "${S}"/Makefile.in || die 'could not patch Makefile.in'
-
-	# remove $(srcdir) from path for multilib build
-	sed -i 's,$(srcdir)/packaging/libldns.pc,packaging/libldns.pc,' "${S}"/Makefile.in || die 'could not patch Makefile.in'
-
-	# remove Libs.private, see bug #695672
-	sed -i '/^Libs.private:/d' "${S}"/packaging/libldns.pc.in || die 'could not patch libldns.pc.in'
-
-	# backport https://github.com/NLnetLabs/ldns/commit/bc9d017f6fd8b6b5d2ff6e4489a2931d0aab8184
-	sed -i 's/AC_SUBST(VERSION_INFO.*/AC_SUBST(VERSION_INFO, [5:0:2])/' "${S}"/configure.ac || die 'could not patch configure.ac'
-
-	eautoreconf
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc ; then
-		emake doxygen
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc ; then
-		dodoc -r doc/html
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README*
-
-	find "${D}" -name '*.la' -delete || die
-	use python && python_optimize
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins libdns.vim
-	fi
-}
diff --git a/net-libs/ldns/ldns-1.8.1.ebuild b/net-libs/ldns/ldns-1.8.1.ebuild
deleted file mode 100644
index 00759dab1a36..000000000000
--- a/net-libs/ldns/ldns-1.8.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9,10} )
-inherit python-single-r1 multilib-minimal
-
-DESCRIPTION="A library with the aim to simplify DNS programming in C"
-HOMEPAGE="https://www.nlnetlabs.nl/projects/ldns/"
-SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc examples python static-libs"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-BDEPEND="
-	python? ( dev-lang/swig )
-	doc? ( app-text/doxygen )
-"
-DEPEND="
-	python? ( ${PYTHON_DEPS} )
-	>=dev-libs/openssl-1.1.1l-r1:0=[${MULTILIB_USEDEP},static-libs?]
-	examples? ( net-libs/libpcap )
-"
-RDEPEND="${DEPEND}
-	!<net-dns/ldns-utils-1.8.0-r2
-"
-
-RESTRICT="test" # missing test directory
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/ldns-config
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/ldns-1.8.1-pkgconfig.patch"
-	)
-	default
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with python pyldns) \
-		$(multilib_native_use_with python pyldnsx) \
-		--with-ssl="${EPREFIX}"/usr \
-		$(multilib_native_with drill) \
-		$(multilib_native_use_with examples) \
-		--disable-rpath
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc ; then
-		emake doxygen
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi && use doc ; then
-		dodoc -r doc/html
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README*
-
-	find "${D}" -name '*.la' -delete || die
-	use python && python_optimize
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins libdns.vim
-}
diff --git a/net-libs/ldns/ldns-1.8.3.ebuild b/net-libs/ldns/ldns-1.8.3-r2.ebuild
index d6ce039b9ddb..15f1bf29756a 100644
--- a/net-libs/ldns/ldns-1.8.3.ebuild
+++ b/net-libs/ldns/ldns-1.8.3-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{10..11} )
 inherit autotools python-single-r1 multilib-minimal
 
 DESCRIPTION="A library with the aim to simplify DNS programming in C"
@@ -39,6 +39,7 @@ PATCHES=(
 	"${FILESDIR}/ldns-1.8.1-pkgconfig.patch"
 	"${FILESDIR}/${P}-docs.patch"
 	"${FILESDIR}/${P}-configure-strict.patch"
+	"${FILESDIR}/${PN}-1.8.3-swig-4.2.0.patch"
 )
 
 pkg_setup() {
diff --git a/net-libs/ldns/metadata.xml b/net-libs/ldns/metadata.xml
index bea05fd65881..8fe7da48f6ca 100644
--- a/net-libs/ldns/metadata.xml
+++ b/net-libs/ldns/metadata.xml
@@ -11,13 +11,6 @@
   level API which allows a programmer to (for instance) create or sign
   packets.
   </longdescription>
-  <use>
-    <flag name="dane">Enable DNS-based Authentication of Named Entities (DANE) support</flag>
-    <flag name="ecdsa">Enable ECDSA support</flag>
-    <flag name="ed25519">Enable ED25519 support</flag>
-    <flag name="ed448">Enable ED448 support</flag>
-    <flag name="gost">Enable GOST support</flag>
-  </use>
   <upstream>
     <remote-id type="github">NLnetLabs/ldns</remote-id>
   </upstream>