summaryrefslogtreecommitdiff
path: root/net-libs
diff options
context:
space:
mode:
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/Manifest.gzbin32773 -> 32776 bytes
-rw-r--r--net-libs/ldns/Manifest7
-rw-r--r--net-libs/ldns/files/ldns-1.7.1-Makefile.patch11
-rw-r--r--net-libs/ldns/ldns-1.7.1-r5.ebuild113
-rw-r--r--net-libs/ldns/ldns-1.8.0-r1.ebuild123
-rw-r--r--net-libs/ldns/ldns-1.8.3.ebuild (renamed from net-libs/ldns/ldns-1.7.1-r6.ebuild)64
6 files changed, 26 insertions, 292 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 822210b3ed3a..1333cb2131c8 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
Binary files differ
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index 27c2f431163d..94fddd0185b5 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,11 +1,8 @@
-AUX ldns-1.7.1-Makefile.patch 1020 BLAKE2B f49a397df95bfcc0ee2eba4cb3f7aa9202d8b940c04a7097c447356198b04f464f10ed5db98db99f4a34ce04ff6d450282306b855a97b72fdc3bbca24f1c0689 SHA512 3779f61e3f20d593843c5b429b7366b826380fe2fb17b74d76d85432189712e34323dad3a653bb45333740caf01d997025b72a96a58ec75cc2fae8c249108e9d
AUX ldns-1.8.1-pkgconfig.patch 273 BLAKE2B 8605665fa76e2493efa4d773742e84a7b1df81cec4b8695a00c3eb4e10b915b4fd4d483f40fa61d14f7303d7f344e3602daecad42491c4de81a9bb0a03e4f896 SHA512 017e0ba07ab348a809852f567ad6c9fc5c0dd3ede9fcc24c53da96d2bfaa2e8e5662eb566818813c19ee19799c4ad6b11e8f5007d1f1fac8b5eb3b05424ec5a0
-DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
DIST ldns-1.8.0.tar.gz 1283220 BLAKE2B f916a8c76d788ac7c52aea8bfe675ad4c614a0c6fb011b61f5a27d4a5dc1a2adb33b5c6992b4813b3758c9b7cceab1c77f8c1d66baaa4de993f23888bce69df1 SHA512 54b306160bb7fd76d181f4be0a13134017f6f98ae96e0c954409f31f262e9dbe611c4b76fb6dff47bb6155c652ed8d026b52a50dfcf611e54d9c204b314c4fd6
DIST ldns-1.8.1.tar.gz 1284971 BLAKE2B ae01ef32571fe3996ddd41f911815239abb704ea1dee479fa612bfd701ca369222ab709923f014662248988cb4452a75bc5debad47d2b0386dc59169b353e6a3 SHA512 600f8e221716742caf439a425008827aef1814fc1d9e751f8f492d0235ff45ca48df90abba17979bac9f4485947bb9fe8102924d9cebe6cb56d5b788e1c4bd14
-EBUILD ldns-1.7.1-r5.ebuild 2616 BLAKE2B 46f0fa25ab712d7ada56a4d568b0a0129cc011140f79d268b25a189279b954f69dd9b20922cf1d4fdf88b4703d65f73e56b24a810de3f7ec1dd288c50e0861fb SHA512 e763854b4f4b4b976a6e0dc99b6443d843449c02d3e4523d9e82f0f8966ee3e82b6f65e9277c138aa5721684f875aff386f1865f6e4f469d370aab5e7d25030f
-EBUILD ldns-1.7.1-r6.ebuild 2342 BLAKE2B 3b1f1083cfd7357b3b74ea6712af9972eac321b17685ccbace79387b12b224500ad86bcc60894c6097c8e0795b36915c3edadc2a08b1f931907b6ea0745c48e7 SHA512 7e8a2112128be6dd02b509419071d01d56fe68a6e3474ff1c78e10c6471536fada0f5ae549dec124e57283d749a609d5fd7f049597e828189f3ad3bc4f34affd
-EBUILD ldns-1.8.0-r1.ebuild 3136 BLAKE2B 2d1ab8c185714e9eef856b86e7cb2bf349d2066e9adb5b12bdc6778bb2ae52f7c96d3e4aa784207be6b94f27ddedc1d710ee8094a6b8602721db3b6e896ea2f4 SHA512 823bd49ce9186a3d7dc9e367d62ca913df592eb83aa63792b5aedf1105a1a18f54553a3579fe320ce295c2f97e42ce9d70e3267f6a4cec63498439cedba0a87d
+DIST ldns-1.8.3.tar.gz 1299856 BLAKE2B 2250445da3beec76c96fbb5cbc00f8d6a5bb6ed5867da7f23511d46ac73d6101303eb6ad85def426b7f9287f6a629a95117bcfa6eb46b775d07ed84048162c7f SHA512 c318747bd975ade389d048680b80495fb083b46507d8dcea7d4d42c75823f56a35b438dcc5320803d39583e5a1e515a51686f7f9010c061a6e8199e1a5505ae9
EBUILD ldns-1.8.0-r4.ebuild 2970 BLAKE2B daf7f3e9d06f4d45861278b75951e5eb1792f8d721229dbb343d2c6e41fe7ba28a21bea5f46a456fb94edab312a7b35a620dd115e02ecdfd59c8755a8cf23885 SHA512 05c6fdfad9784b3bd38d52bb6ac2f09617a109ddd3c24ce99ac57f5c52270da6ce229b9c1d2bb886b9109dc112a7596bb24355ced8b3f9cfb2983bd24b672f8e
EBUILD ldns-1.8.1.ebuild 1842 BLAKE2B 8ec37b4adba589508ad5ebaa4fee0c6326c6d6ee7659e46a4d41f25a69549b3ee460e78ffe24dd9e4b5c763b773100d3d871e169c0c64b08c3f2359d5e7df1d0 SHA512 c551fafcf95fbced99f02d5ae81ac5596038f51fa2dbaafedc6001369ec2d50a197e2b345ec500488b3a11f3058d3586d759b32f122cc9f8b4638fa55a23c926
+EBUILD ldns-1.8.3.ebuild 1842 BLAKE2B 8ec37b4adba589508ad5ebaa4fee0c6326c6d6ee7659e46a4d41f25a69549b3ee460e78ffe24dd9e4b5c763b773100d3d871e169c0c64b08c3f2359d5e7df1d0 SHA512 c551fafcf95fbced99f02d5ae81ac5596038f51fa2dbaafedc6001369ec2d50a197e2b345ec500488b3a11f3058d3586d759b32f122cc9f8b4638fa55a23c926
MISC metadata.xml 933 BLAKE2B 4382e8d75f379211e781a0309b483105cbdba740cbd473b29d6b892351d3a5d270487c759ba7a1f5bcad448222cb1c24ef8257cd089c54ce9df0523ff708888a SHA512 395c02c568874e3d22434431f5e72dd98a647455ec0587723cb447c4d5a2fb468256bb35aff2c74b8255203d21f4d844f5a4ad426037eeb907d67ffedeb6d74e
diff --git a/net-libs/ldns/files/ldns-1.7.1-Makefile.patch b/net-libs/ldns/files/ldns-1.7.1-Makefile.patch
deleted file mode 100644
index d654bbda6131..000000000000
--- a/net-libs/ldns/files/ldns-1.7.1-Makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2019-09-29 15:17:24.728446345 +0200
-+++ Makefile.in 2019-09-29 15:18:09.544008785 +0200
-@@ -301,7 +301,7 @@
- $(COMP_LIB) -I./include/ldns $(LIBSSL_CPPFLAGS) $(PYTHON_CPPFLAGS) $(PYTHON_X_CFLAGS) -c $(pywrapdir)/ldns_wrapper.c -o $@
-
- _ldns.la: ldns_wrapper.lo libldns.la
-- $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) $(LDFLAGS) $(PYTHON_LDFLAGS) -module -version-info $(version_info) -no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) -L. -L.libs -lldns $(LIBS)
-+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) -module -version-info $(version_info) -no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) -L. -L.libs -lldns $(LDFLAGS) $(PYTHON_LDFLAGS) $(LIBS)
-
- $(p5_dns_ldns_dir)/Makefile: $(p5_dns_ldns_dir)/Makefile.PL
- BUILDDIR=`pwd`; cd $(p5_dns_ldns_dir); LD_LIBRARY_PATH="$$BUILDDIR/.libs:$$LD_LIBRARY_PATH" DYLD_LIBRARY_PATH="$$BUILDDIR/.libs:$$DYLD_LIBRARY_PATH" $(PERL) Makefile.PL LIBS="-L$$BUILDDIR/.libs -lldns" INC="-I$$BUILDDIR"
diff --git a/net-libs/ldns/ldns-1.7.1-r5.ebuild b/net-libs/ldns/ldns-1.7.1-r5.ebuild
deleted file mode 100644
index f6d989650b3a..000000000000
--- a/net-libs/ldns/ldns-1.7.1-r5.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9,10} )
-inherit multilib-minimal python-single-r1
-
-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 gost python static-libs vim-syntax"
-
-# configure will die if ecdsa is enabled and ssl is not
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
- python? ( ${PYTHON_DEPS} )
- ecdsa? (
- >=dev-libs/openssl-1.0.1e:0=[-bindist(-),${MULTILIB_USEDEP}]
- )
- ed25519? (
- >=dev-libs/openssl-1.1.0:0=[-bindist(-),${MULTILIB_USEDEP}]
- )
- ed448? (
- >=dev-libs/openssl-1.1.1:0=[-bindist(-),${MULTILIB_USEDEP}]
- )
- >=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- python? ( dev-lang/swig )
- doc? ( app-doc/doxygen )
-"
-
-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 \
- --without-drill \
- --without-examples \
- ${dane_ta_usage} \
- --disable-rpath
-}
-
-src_prepare() {
- default
- eapply -p0 "${FILESDIR}/${P}-Makefile.patch"
- # remove non-existing dependency for target packaging/libldns.pc
- sed -i 's,packaging/libldns.pc.in,,' "${S}"/Makefile.in || die 'could not patch Makefile.in'
-}
-
-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
-
- einfo
- elog "Install net-dns/ldns-utils if you want drill and examples"
- einfo
-}
diff --git a/net-libs/ldns/ldns-1.8.0-r1.ebuild b/net-libs/ldns/ldns-1.8.0-r1.ebuild
deleted file mode 100644
index bf37356dc1e8..000000000000
--- a/net-libs/ldns/ldns-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2023 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 gost python static-libs vim-syntax"
-
-# configure will die if ecdsa is enabled and ssl is not
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
- python? ( ${PYTHON_DEPS} )
- ecdsa? (
- >=dev-libs/openssl-1.0.1e:0=[-bindist(-),${MULTILIB_USEDEP}]
- )
- ed25519? (
- >=dev-libs/openssl-1.1.0:0=[-bindist(-),${MULTILIB_USEDEP}]
- )
- ed448? (
- >=dev-libs/openssl-1.1.1:0=[-bindist(-),${MULTILIB_USEDEP}]
- )
- >=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- python? ( dev-lang/swig )
- doc? ( app-doc/doxygen )
-"
-
-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 \
- --without-drill \
- --without-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
-
- einfo
- elog "Install net-dns/ldns-utils if you want drill and examples"
- einfo
-}
diff --git a/net-libs/ldns/ldns-1.7.1-r6.ebuild b/net-libs/ldns/ldns-1.8.3.ebuild
index fcb1ce8215f5..310606f4c952 100644
--- a/net-libs/ldns/ldns-1.7.1-r6.ebuild
+++ b/net-libs/ldns/ldns-1.8.3.ebuild
@@ -3,7 +3,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{9,10} )
-inherit multilib-minimal python-single-r1
+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/"
@@ -11,23 +11,27 @@ 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 gost python static-libs vim-syntax"
+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} )
"
-RDEPEND="
- python? ( ${PYTHON_DEPS} )
- >=dev-libs/openssl-1.1.1l-r1:0=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
+BDEPEND="
python? ( dev-lang/swig )
doc? ( app-doc/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" # 1.6.9 has no test directory
+RESTRICT="test" # missing test directory
MULTILIB_CHOST_TOOLS=(
/usr/bin/ldns-config
@@ -37,39 +41,25 @@ 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
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}/ldns-1.8.1-pkgconfig.patch"
+ )
+ default
+}
+multilib_src_configure() {
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 \
- --without-drill \
- --without-examples \
- ${dane_ta_usage} \
+ $(multilib_native_with drill) \
+ $(multilib_native_use_with examples) \
--disable-rpath
}
-src_prepare() {
- default
- eapply -p0 "${FILESDIR}/${P}-Makefile.patch"
- # remove non-existing dependency for target packaging/libldns.pc
- sed -i 's,packaging/libldns.pc.in,,' "${S}"/Makefile.in || die 'could not patch Makefile.in'
-}
-
multilib_src_compile() {
default
@@ -92,12 +82,6 @@ multilib_src_install_all() {
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
-
- einfo
- elog "Install net-dns/ldns-utils if you want drill and examples"
- einfo
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins libdns.vim
}