diff options
Diffstat (limited to 'net-dns')
237 files changed, 6635 insertions, 3756 deletions
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest index 8827967c8d22..ac584b7aa178 100644 --- a/net-dns/avahi/Manifest +++ b/net-dns/avahi/Manifest @@ -1 +1,2 @@ DIST avahi-0.8.tar.gz 953319 BLAKE2B ddede1b8790ff3057ea5f4bb710e95578229e078a7abac83121e043017dda1ab3d971c723f920fdd4f3d98b88bd2cf21f9645bec1b7bbd2ea194cb399a5f5b46 SHA512 27bba9a551152dfc7e721f326042e7bfce55d227044a6cbaee04d6fb0e3f59c36e159c2b7a4dd42d1c955cdf37cc1c303e91991c08928bbded91d796e9a22abe +DIST avahi-0.9_rc1.tar.gz 1057252 BLAKE2B f38c35d25c439d0d4dce00131d61d4be816fdcf14ddbe4f91fed95990ac6313b8ed905bca84f693feeccf92b891c849a994cbee80b02732108a18378b044d4b4 SHA512 c46ef2c646ae7a7be8e61ef18924a5c1349e19293ecd2e95f51dd6cd41967ea2f118ca2af48671c68a5b33687cdd6cbadb8745d95e8b69963d0b73f2d447db8d diff --git a/net-dns/avahi/avahi-0.8-r5.ebuild b/net-dns/avahi/avahi-0.8-r7.ebuild index 4eebdd8f80d7..4995d06ffdbd 100644 --- a/net-dns/avahi/avahi-0.8-r5.ebuild +++ b/net-dns/avahi/avahi-0.8-r7.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="gdbm" inherit autotools flag-o-matic multilib-minimal mono-env python-single-r1 systemd @@ -61,8 +61,8 @@ RDEPEND=" " BDEPEND=" dev-util/glib-utils - doc? ( app-doc/doxygen ) - app-doc/xmltoman + doc? ( app-text/doxygen ) + app-text/xmltoman sys-devel/gettext virtual/pkgconfig " @@ -71,6 +71,10 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/avahi-qt5/qt-watch.h ) PATCHES=( "${FILESDIR}/${P}-disable-avahi-ui-sharp.patch" # bug 769062 + "${FILESDIR}/${P}-dependency-error.patch" + "${FILESDIR}/${P}-null-pointer-crash.patch" + "${FILESDIR}/${P}-potentially-undefined-fix.patch" + "${FILESDIR}/${P}-strict-prototypes.patch" # These patches do not apply cleanly but may need to be re-instated. # I'll leave them commented out for now. # "${FILESDIR}/${PN}-0.7-qt5.patch" diff --git a/net-dns/avahi/avahi-0.9_rc1.ebuild b/net-dns/avahi/avahi-0.9_rc1.ebuild new file mode 100644 index 000000000000..e4f7cb84a6ab --- /dev/null +++ b/net-dns/avahi/avahi-0.9_rc1.ebuild @@ -0,0 +1,203 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_REQ_USE="gdbm" +inherit autotools multilib-minimal python-single-r1 systemd + +DESCRIPTION="System which facilitates service discovery on a local network" +HOMEPAGE="https://avahi.org/" +SRC_URI="https://github.com/lathiat/avahi/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${PV/_/-}" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="autoipd bookmarks +dbus doc gdbm gtk howl-compat +introspection ipv6 mdnsresponder-compat nls python qt5 selinux systemd test" + +REQUIRED_USE=" + python? ( dbus gdbm ${PYTHON_REQUIRED_USE} ) + bookmarks? ( python ) + howl-compat? ( dbus ) + mdnsresponder-compat? ( dbus ) + systemd? ( dbus ) +" + +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/libdaemon + dev-libs/libevent:=[${MULTILIB_USEDEP}] + dev-libs/expat + dev-libs/glib:2[${MULTILIB_USEDEP}] + gdbm? ( sys-libs/gdbm:=[${MULTILIB_USEDEP}] ) + qt5? ( dev-qt/qtcore:5 ) + gtk? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] ) + dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) + kernel_linux? ( sys-libs/libcap ) + introspection? ( dev-libs/gobject-introspection:= ) + systemd? ( sys-apps/systemd:=[${MULTILIB_USEDEP}] ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + bookmarks? ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] ) + dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) + introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] ) + ') + ) +" +RDEPEND=" + acct-user/avahi + acct-group/avahi + acct-group/netdev + autoipd? ( + acct-user/avahi-autoipd + acct-group/avahi-autoipd + ) + ${DEPEND} + selinux? ( sec-policy/selinux-avahi ) +" +BDEPEND=" + dev-util/glib-utils + doc? ( app-text/doxygen ) + app-text/xmltoman + sys-devel/gettext + virtual/pkgconfig +" + +MULTILIB_WRAPPED_HEADERS=( /usr/include/avahi-qt5/qt-watch.h ) + +PATCHES=( + "${FILESDIR}/${P}-disable-avahi-ui-sharp.patch" # bug 769062 +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + if ! use ipv6; then + sed -i \ + -e "s/use-ipv6=yes/use-ipv6=no/" \ + avahi-daemon/avahi-daemon.conf || die + fi + + sed -i \ + -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \ + doxygen_to_devhelp.xsl || die + + eautoreconf + + # bundled manpages + multilib_copy_sources +} + +multilib_src_configure() { + local myconf=( + --disable-gtk + --disable-mono + --disable-monodoc + --disable-python-dbus + --disable-qt3 + --disable-qt4 + --disable-static + --enable-manpages + --enable-glib + --enable-gobject + --enable-xmltoman + --localstatedir="${EPREFIX}/var" + --runstatedir="${EPREFIX}/run" + --with-distro=gentoo + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_enable dbus) + $(use_enable gdbm) + $(use_enable gtk gtk3) + $(use_enable howl-compat compat-howl) + $(use_enable mdnsresponder-compat compat-libdns_sd) + $(use_enable nls) + $(use_enable systemd libsystemd) + $(multilib_native_use_enable autoipd) + $(multilib_native_use_enable doc doxygen-doc) + $(multilib_native_use_enable introspection) + $(multilib_native_use_enable python) + $(multilib_native_use_enable test tests) + ) + + if use python; then + myconf+=( + $(multilib_native_use_enable dbus python-dbus) + $(multilib_native_use_enable introspection pygobject) + ) + fi + + if ! multilib_is_native_abi; then + myconf+=( + # used by daemons only + --disable-libdaemon + --with-xml=none + ) + fi + + myconf+=( $(multilib_native_use_enable qt5) ) + + econf "${myconf[@]}" +} + +multilib_src_compile() { + emake + + multilib_is_native_abi && use doc && emake avahi.devhelp +} + +multilib_src_install() { + emake install DESTDIR="${D}" + + if ! use bookmarks || ! use python || ! use dbus; then + rm -f "${ED}"/usr/bin/avahi-bookmarks || die + fi + + # https://github.com/lathiat/avahi/issues/28 + use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc + use mdnsresponder-compat && dosym avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h + + if multilib_is_native_abi && use doc; then + docinto html + dodoc -r doxygen/html/. + insinto /usr/share/devhelp/books/avahi + doins avahi.devhelp + fi + + # The build system creates an empty "/run" directory, so we clean it up here + rmdir "${ED}"/run || die +} + +multilib_src_install_all() { + use python && python_optimize + + if use autoipd; then + insinto /lib/rcscripts/net + doins "${FILESDIR}"/autoipd.sh + + insinto /lib/netifrc/net + newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh + fi + + dodoc docs/{AUTHORS,NEWS,README,TODO} + + find "${ED}" -name '*.la' -type f -delete || die +} + +pkg_postinst() { + if use autoipd; then + elog + elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)" + elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!" + elog + fi + + systemd_reenable avahi-daemon.service +} diff --git a/net-dns/avahi/files/avahi-0.8-dependency-error.patch b/net-dns/avahi/files/avahi-0.8-dependency-error.patch new file mode 100644 index 000000000000..1a4025ea2002 --- /dev/null +++ b/net-dns/avahi/files/avahi-0.8-dependency-error.patch @@ -0,0 +1,15 @@ +https://github.com/lathiat/avahi/commit/366e3798bdbd6b7bf24e59379f4a9a51af575ce9.patch +From: =?UTF-8?q?Tomasz=20Pawe=C5=82=20Gajc?= <tpgxyz@gmail.com> +Date: Thu, 20 Feb 2020 16:09:40 +0100 +Subject: [PATCH] fix requires in pc file + +--- a/avahi-libevent.pc.in ++++ b/avahi-libevent.pc.in +@@ -6,6 +6,6 @@ includedir=${prefix}/include + Name: avahi-libevent + Description: Avahi Multicast DNS Responder (libevent Support) + Version: @PACKAGE_VERSION@ +-Requires: libevent-2.1.5 ++Requires: libevent >= 2.1.5 + Libs: -L${libdir} -lavahi-libevent + Cflags: -D_REENTRANT -I${includedir} diff --git a/net-dns/avahi/files/avahi-0.8-disable-avahi-ui-sharp.patch b/net-dns/avahi/files/avahi-0.8-disable-avahi-ui-sharp.patch index 31b361d4e17f..35f2a15af919 100644 --- a/net-dns/avahi/files/avahi-0.8-disable-avahi-ui-sharp.patch +++ b/net-dns/avahi/files/avahi-0.8-disable-avahi-ui-sharp.patch @@ -4,13 +4,6 @@ Date: Sat, 27 Mar 2021 22:49:08 +0100 Subject: [PATCH] Disable avahi-ui-sharp Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - Makefile.am | 6 ++---- - configure.ac | 1 - - 2 files changed, 2 insertions(+), 5 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 33c51f5..0e12120 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,7 +46,6 @@ EXTRA_DIST = \ @@ -40,8 +33,6 @@ index 33c51f5..0e12120 100644 endif endif -diff --git a/configure.ac b/configure.ac -index 58db8c7..844360f 100644 --- a/configure.ac +++ b/configure.ac @@ -1166,7 +1166,6 @@ man/Makefile @@ -52,6 +43,3 @@ index 58db8c7..844360f 100644 avahi-compat-libdns_sd/Makefile avahi-compat-howl/Makefile avahi-compat-howl/samples/Makefile --- -2.31.1 - diff --git a/net-dns/avahi/files/avahi-0.8-null-pointer-crash.patch b/net-dns/avahi/files/avahi-0.8-null-pointer-crash.patch new file mode 100644 index 000000000000..93ed513a59cd --- /dev/null +++ b/net-dns/avahi/files/avahi-0.8-null-pointer-crash.patch @@ -0,0 +1,129 @@ +https://github.com/lathiat/avahi/commit/fd482a74625b8db8547b8cfca3ee3d3c6c721423.patch +From: Tommi Rantala <tommi.t.rantala@nokia.com> +Date: Mon, 8 Feb 2021 11:04:43 +0200 +Subject: [PATCH] Fix NULL pointer crashes from #175 + +avahi-daemon is crashing when running "ping .local". +The crash is due to failing assertion from NULL pointer. +Add missing NULL pointer checks to fix it. + +Introduced in #175 - merge commit 8f75a045709a780c8cf92a6a21e9d35b593bdecd +--- a/avahi-core/browse-dns-server.c ++++ b/avahi-core/browse-dns-server.c +@@ -343,7 +343,10 @@ AvahiSDNSServerBrowser *avahi_s_dns_server_browser_new( + AvahiSDNSServerBrowser* b; + + b = avahi_s_dns_server_browser_prepare(server, interface, protocol, domain, type, aprotocol, flags, callback, userdata); ++ if (!b) ++ return NULL; ++ + avahi_s_dns_server_browser_start(b); + + return b; +-} +\ No newline at end of file ++} + +--- a/avahi-core/browse-domain.c ++++ b/avahi-core/browse-domain.c +@@ -253,7 +253,10 @@ AvahiSDomainBrowser *avahi_s_domain_browser_new( + AvahiSDomainBrowser *b; + + b = avahi_s_domain_browser_prepare(server, interface, protocol, domain, type, flags, callback, userdata); ++ if (!b) ++ return NULL; ++ + avahi_s_domain_browser_start(b); + + return b; +-} +\ No newline at end of file ++} + +--- a/avahi-core/browse-service-type.c ++++ b/avahi-core/browse-service-type.c +@@ -171,6 +171,9 @@ AvahiSServiceTypeBrowser *avahi_s_service_type_browser_new( + AvahiSServiceTypeBrowser *b; + + b = avahi_s_service_type_browser_prepare(server, interface, protocol, domain, flags, callback, userdata); ++ if (!b) ++ return NULL; ++ + avahi_s_service_type_browser_start(b); + + return b; + +--- a/avahi-core/browse-service.c ++++ b/avahi-core/browse-service.c +@@ -184,6 +184,9 @@ AvahiSServiceBrowser *avahi_s_service_browser_new( + AvahiSServiceBrowser *b; + + b = avahi_s_service_browser_prepare(server, interface, protocol, service_type, domain, flags, callback, userdata); ++ if (!b) ++ return NULL; ++ + avahi_s_service_browser_start(b); + + return b; + +--- a/avahi-core/browse.c ++++ b/avahi-core/browse.c +@@ -634,6 +634,9 @@ AvahiSRecordBrowser *avahi_s_record_browser_new( + AvahiSRecordBrowser *b; + + b = avahi_s_record_browser_prepare(server, interface, protocol, key, flags, callback, userdata); ++ if (!b) ++ return NULL; ++ + avahi_s_record_browser_start_query(b); + + return b; + +--- a/avahi-core/resolve-address.c ++++ b/avahi-core/resolve-address.c +@@ -286,7 +286,10 @@ AvahiSAddressResolver *avahi_s_address_resolver_new( + AvahiSAddressResolver *b; + + b = avahi_s_address_resolver_prepare(server, interface, protocol, address, flags, callback, userdata); ++ if (!b) ++ return NULL; ++ + avahi_s_address_resolver_start(b); + + return b; +-} +\ No newline at end of file ++} + +--- a/avahi-core/resolve-host-name.c ++++ b/avahi-core/resolve-host-name.c +@@ -318,7 +318,10 @@ AvahiSHostNameResolver *avahi_s_host_name_resolver_new( + AvahiSHostNameResolver *b; + + b = avahi_s_host_name_resolver_prepare(server, interface, protocol, host_name, aprotocol, flags, callback, userdata); ++ if (!b) ++ return NULL; ++ + avahi_s_host_name_resolver_start(b); + + return b; +-} +\ No newline at end of file ++} + +--- a/avahi-core/resolve-service.c ++++ b/avahi-core/resolve-service.c +@@ -519,7 +519,10 @@ AvahiSServiceResolver *avahi_s_service_resolver_new( + AvahiSServiceResolver *b; + + b = avahi_s_service_resolver_prepare(server, interface, protocol, name, type, domain, aprotocol, flags, callback, userdata); ++ if (!b) ++ return NULL; ++ + avahi_s_service_resolver_start(b); + + return b; +-} +\ No newline at end of file ++} + diff --git a/net-dns/avahi/files/avahi-0.8-potentially-undefined-fix.patch b/net-dns/avahi/files/avahi-0.8-potentially-undefined-fix.patch new file mode 100644 index 000000000000..4419831939e1 --- /dev/null +++ b/net-dns/avahi/files/avahi-0.8-potentially-undefined-fix.patch @@ -0,0 +1,25 @@ +https://github.com/lathiat/avahi/commit/b897ca43ac100d326d118e5877da710eb7f836f9.patch +From: traffic-millions <60914101+traffic-millions@users.noreply.github.com> +Date: Tue, 3 Mar 2020 11:15:48 +0800 +Subject: [PATCH] avahi_dns_packet_consume_uint32: fix potential undefined + behavior + +avahi_dns_packet_consume_uint32 left shifts uint8_t values by 8, 16 and 24 bits to combine them into a 32-bit value. This produces an undefined behavior warning with gcc -fsanitize when fed input values of 128 or 255 however in testing no actual unexpected behavior occurs in practice and the 32-bit uint32_t is always correctly produced as the final value is immediately stored into a uint32_t and the compiler appears to handle this "correctly". + +Cast the intermediate values to uint32_t to prevent this warning and ensure the intended result is explicit. + +Closes: #267 +Closes: #268 +Reference: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=19304 +--- a/avahi-core/dns.c ++++ b/avahi-core/dns.c +@@ -455,7 +455,7 @@ int avahi_dns_packet_consume_uint32(AvahiDnsPacket *p, uint32_t *ret_v) { + return -1; + + d = (uint8_t*) (AVAHI_DNS_PACKET_DATA(p) + p->rindex); +- *ret_v = (d[0] << 24) | (d[1] << 16) | (d[2] << 8) | d[3]; ++ *ret_v = ((uint32_t)d[0] << 24) | ((uint32_t)d[1] << 16) | ((uint32_t)d[2] << 8) | (uint32_t)d[3]; + p->rindex += sizeof(uint32_t); + + return 0; + diff --git a/net-dns/avahi/files/avahi-0.8-strict-prototypes.patch b/net-dns/avahi/files/avahi-0.8-strict-prototypes.patch new file mode 100644 index 000000000000..3954aa4357ae --- /dev/null +++ b/net-dns/avahi/files/avahi-0.8-strict-prototypes.patch @@ -0,0 +1,38 @@ +https://github.com/lathiat/avahi/pull/405 + +From 54409e5af9c382117b67674756971f4f1bf646f8 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sat, 5 Nov 2022 23:49:47 +0000 +Subject: [PATCH] configure.ac: fix -Wstrict-prototypes + +Fixes errors like: +``` +-ignoreme: warning: a function definition without a prototype is deprecated in all versions of C and is not supported in C2x [-Wdeprecated-non-prototype] ++ignoreme: error: a function definition without a prototype is deprecated in all versions of C and is not supported in C2x [-Werror,-Wdeprecated-non-prototype] + void test_broken_ssp(c) + ^ +``` + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.ac ++++ b/configure.ac +@@ -99,8 +99,7 @@ if test x"$enable_ssp" = x"yes"; then + LDFLAGS="$LDFLAGS -Wl,-z,defs" + cat confdefs.h > conftest.c + cat >>conftest.c <<_ACEOF +-void test_broken_ssp(c) +- const char *c; ++void test_broken_ssp(const char *c) + { + char arr[[123]], *p; /* beware of possible double-braces if copying this */ + for (p = arr; *c; ++p) { +@@ -300,7 +299,7 @@ AM_CONDITIONAL(TARGET_FREEBSD, test x"$with_distro" = xfreebsd) + AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware) + + test_gcc_flag() { +- AC_LANG_CONFTEST([int main() {}]) ++ AC_LANG_CONFTEST([int main(void) {}]) + $CC -c conftest.c $CFLAGS $@ > /dev/null 2> /dev/null + ret=$? + rm -f conftest.o + diff --git a/net-dns/avahi/files/avahi-0.9_rc1-disable-avahi-ui-sharp.patch b/net-dns/avahi/files/avahi-0.9_rc1-disable-avahi-ui-sharp.patch new file mode 100644 index 000000000000..587bd315856e --- /dev/null +++ b/net-dns/avahi/files/avahi-0.9_rc1-disable-avahi-ui-sharp.patch @@ -0,0 +1,43 @@ +diff --git a/Makefile.am b/Makefile.am +index 33c51f5..0e12120 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -46,7 +46,6 @@ EXTRA_DIST = \ + avahi-qt4.pc.in \ + avahi-qt5.pc.in \ + avahi-sharp.pc.in \ +- avahi-ui-sharp.pc.in \ + avahi-compat-libdns_sd.pc.in \ + avahi-compat-howl.pc.in \ + avahi-ui.pc.in \ +@@ -77,7 +76,6 @@ SUBDIRS = \ + avahi-compat-howl \ + avahi-autoipd \ + avahi-ui \ +- avahi-ui-sharp \ + avahi-libevent \ + po + +@@ -188,8 +186,8 @@ CLEANFILES += avahi-compat-libdns_sd.pc + endif + + if HAVE_MONO +-pkgconfig_DATA += avahi-sharp.pc avahi-ui-sharp.pc +-CLEANFILES += avahi-sharp.pc avahi-ui-sharp.pc ++pkgconfig_DATA += avahi-sharp.pc ++CLEANFILES += avahi-sharp.pc + endif + + endif +diff --git a/configure.ac b/configure.ac +index 2f63730..fed400d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1183,7 +1183,6 @@ man/Makefile + tests/Makefile + service-type-database/Makefile + avahi-sharp/Makefile +-avahi-ui-sharp/Makefile + avahi-compat-libdns_sd/Makefile + avahi-compat-howl/Makefile + avahi-compat-howl/samples/Makefile diff --git a/net-dns/avahi/metadata.xml b/net-dns/avahi/metadata.xml index 6345117afbda..ff7fbb13b76b 100644 --- a/net-dns/avahi/metadata.xml +++ b/net-dns/avahi/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="autoipd">Build and install the IPv4LL (RFC3927) network address configuration daemon</flag> <flag name="bookmarks">Install the avahi-bookmarks application (requires <pkg>dev-python/twisted</pkg>)</flag> diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest index fe9aee4cdc9c..8f4c01292ea8 100644 --- a/net-dns/bind-tools/Manifest +++ b/net-dns/bind-tools/Manifest @@ -1,6 +1,3 @@ -DIST bind-9.16.15.tar.xz 5025688 BLAKE2B 8b0723d46f812793f5a52b1ddacf21fe28e183ef8cd166eadf0af163280021fce7c0a6a560d28dacbc6dd4642e41eb5424b4de2c5ff1049a5cfa5d52e3df5beb SHA512 30dad6e2144b3ac53ef0a2d1ed3c8342120f148fc0eb6409113a6d5ed3444eecb917915fdf39c26fd223396fc1e873410a50da305f0b870864f7fbbdccec8033 -DIST bind-9.16.18.tar.xz 5023512 BLAKE2B 7766c1e6ab30ae42f0ba49d96fe0e2675e79aa01c48569d3cf5c122944319fbb88299a193ce06cc0aa67f6085fd80e29472fc7adc845e4bbb7ff6896dae87ed6 SHA512 6ba2f14324ebdc66d2a6d60e929fb47e170dd7662cf4b18ef3ad9da30a61b43c7d5539e931c483ab36e63ae0398aeed255fd672489fb332dccf182df9aa102f9 -DIST bind-9.16.21.tar.xz 5057816 BLAKE2B bc7de285b45084a4904aee7c5c3042c7a2075968f19ed76b932c976f86f60bc8bf0d6cce8889a9adf7e807c8151bd6088ef1b2b00460a4d1cff7a74bb2221d43 SHA512 2cb71e50600fd7409ca7b7e2e9cf4ef6668b07faad7980ac8060e6a76f30a315182d75534ad1dcfb740c225cdf727b2bd6aa9ceb24ab77ffff09b7b5d6eaca2d -DIST bind-9.16.22.tar.xz 5059000 BLAKE2B c4853a8be268f9666f3677adf2e64c6d74f7df44d2dc05df544cead38c6c3b86489d25a66ccea6ce8ca89fa525a1848fe93a8aaa6bb1ee090aa189bf6aad40f3 SHA512 586fb4d5a656d6539033dcdfdd230b36465a2d2e6ada651c1f1548d062a9050e7a962af87e2a56931fe24c65586d29012d4a041dcddbb28f42b4d01fe291d9d1 -DIST bind-9.16.25.tar.xz 5086780 BLAKE2B cb62d0d4e25f508f1a77fae6a11ff144d2436346c45a936d572df4c843cd72ec81cffacd0a81dcb74eb73b8bca7d0762a5746baadda36f260b79b72eade24d18 SHA512 e43c0e59159d3a5642db051f3982d8767fb726426380c32960fefe4b9afd05708ed8f7e80a98b803a580b048e1a368c888e2dd5695fa5fcd7b8b75574a27cb62 -DIST bind-9.16.27.tar.xz 5084340 BLAKE2B 37b49ce81aa5122493a4feb2bb7be53c5d46ff2ce28456aec31ce1332520a09c10bb2293c736bffe7badbc2bc3d156c05f83367678bd101e17b99ca3ff69bebf SHA512 5c71f228db83aa8cc9e65466d6e5afca4a9f80c693358111a003fe09e1a14522175eb2b6a0f11e2a2cd4fdba01f2ae315de52e394a441b3861ca2a011e02af62 +DIST bind-9.16.42.tar.xz 5123476 BLAKE2B 7cda7df38beaa602fde0142b46c8bcf401cda8afdf00383724ccaa8f3e3f71d320bbd4b7f3be33bcc9c59465932caab1f8c62ca64b79a1470cbdaa01f0048b00 SHA512 cf29e72c9c979f3cf8ba0b17357fb09c37f1436a7f3a518f49ce4b4c682fb367dd3d8e71de6603c166c95a7c535a77a9f2a1393a59723294626acefebbc95fd6 +DIST bind-9.16.48.tar.xz 5131176 BLAKE2B 4a503b45df412c435cb0f75b54ee1270140cccce7ecc159cdf3e0e3cbd3c0a0866b7472782f20aacf130f57df12d20a102ac6979498138ce00a2655806d003e7 SHA512 83829a5045e2a29dd2b491d3ab72b545f5664023fcd4aa205a44dbb7bcc5c737b4466c0d73f124b8d88fd33c56776871a07dde1ba0530d43eec8e7304a08d353 +DIST bind-9.16.48.tar.xz.asc 833 BLAKE2B 740ed58863ed3a7dee6ada4edd03cad5378ea0aa53cd6f071ca1911bb2d6b285ed292f32846790d42b97e8d9bb72588f1cd30c4e10557ac1e9f1df545923a9b1 SHA512 7bd813b5ab6f9677fc4ef21e0c3930f6319fa6c49d6869570794bc28212fe8935b72f9f217cfce692a2dec9ec29994f345d1b1145cef1ca976c5361f6ce0f75d diff --git a/net-dns/bind-tools/bind-tools-9.16.15.ebuild b/net-dns/bind-tools/bind-tools-9.16.15.ebuild deleted file mode 100644 index 892235add429..000000000000 --- a/net-dns/bind-tools/bind-tools-9.16.15.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic toolchain-funcs - -MY_PN=${PN//-tools} -MY_PV=${PV/_p/-P} -MY_PV=${MY_PV/_rc/rc} -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" -HOMEPAGE="https://www.isc.org/software/bind" -SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz" - -LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+caps doc gssapi idn ipv6 libedit readline xml" -# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 - -COMMON_DEPEND=" - dev-libs/libuv:= - caps? ( sys-libs/libcap ) - dev-libs/openssl:= - xml? ( dev-libs/libxml2 ) - idn? ( net-dns/libidn2:= ) - gssapi? ( virtual/krb5 ) - libedit? ( dev-libs/libedit ) - !libedit? ( - readline? ( sys-libs/readline:= ) - ) -" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" - -# sphinx required for man-page and html creation -BDEPEND=" - doc? ( dev-python/sphinx ) - virtual/pkgconfig -" - -S="${WORKDIR}/${MY_P}" - -# bug 479092, requires networking -RESTRICT="test" - -src_prepare() { - default - - export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)" - - # Disable tests for now, bug 406399 - sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die - - # bug #220361 - rm aclocal.m4 || die - rm -rf libtool.m4/ || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --localstatedir="${EPREFIX}"/var - --without-python - --without-libjson - --without-zlib - --without-lmdb - --without-maxminddb - --disable-geoip - --with-openssl="${EPREFIX}"/usr - $(use_with idn libidn2) - $(use_with xml libxml2) - $(use_with gssapi) - $(use_with readline) - $(use_enable caps linux-caps) - AR="$(type -P $(tc-getAR))" - ) - - # bug 607400 - if use libedit ; then - myeconfargs+=( --with-readline=-ledit ) - elif use readline ; then - myeconfargs+=( --with-readline=-lreadline ) - else - myeconfargs+=( --without-readline ) - fi - - # bug 344029 - append-cflags "-DDIG_SIGCHASE" - - # to expose CMSG_* macros from sys/sockets.h - [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600" - - # localstatedir for nsupdate -l, bug 395785 - tc-export BUILD_CC - econf "${myeconfargs[@]}" - - # bug #151839 - echo '#undef SO_BSDCOMPAT' >> config.h -} - -src_compile() { - local AR=$(tc-getAR) - - emake AR="${AR}" -C lib/ - emake AR="${AR}" -C bin/delv/ - emake AR="${AR}" -C bin/dig/ - emake AR="${AR}" -C bin/nsupdate/ - emake AR="${AR}" -C bin/dnssec/ - emake -C doc/man/ man $(usev doc) -} - -src_install() { - local man_dir="${S}/doc/man" - local html_dir="${man_dir}/_build/html" - - dodoc README CHANGES - - cd "${S}"/bin/delv || die - dobin delv - doman ${man_dir}/delv.1 - - cd "${S}"/bin/dig || die - dobin dig host nslookup - doman ${man_dir}/{dig,host,nslookup}.1 - - cd "${S}"/bin/nsupdate || die - dobin nsupdate - doman ${man_dir}/nsupdate.1 - if use doc; then - docinto html - dodoc ${html_dir}/nsupdate.html - fi - - cd "${S}"/bin/dnssec || die - for tool in dsfromkey importkey keyfromlabel keygen \ - revoke settime signzone verify; do - dobin dnssec-"${tool}" - doman ${man_dir}/dnssec-"${tool}".8 - if use doc; then - docinto html - dodoc ${html_dir}/dnssec-"${tool}".html - fi - done -} diff --git a/net-dns/bind-tools/bind-tools-9.16.18.ebuild b/net-dns/bind-tools/bind-tools-9.16.18.ebuild deleted file mode 100644 index fdd10e501a52..000000000000 --- a/net-dns/bind-tools/bind-tools-9.16.18.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic toolchain-funcs - -MY_PN=${PN//-tools} -MY_PV=${PV/_p/-P} -MY_PV=${MY_PV/_rc/rc} -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" -HOMEPAGE="https://www.isc.org/software/bind" -SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz" - -LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+caps doc gssapi idn ipv6 libedit readline xml" -# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 - -COMMON_DEPEND=" - dev-libs/libuv:= - caps? ( sys-libs/libcap ) - dev-libs/openssl:= - xml? ( dev-libs/libxml2 ) - idn? ( net-dns/libidn2:= ) - gssapi? ( virtual/krb5 ) - libedit? ( dev-libs/libedit ) - !libedit? ( - readline? ( sys-libs/readline:= ) - ) -" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" - -# sphinx required for man-page and html creation -BDEPEND=" - doc? ( dev-python/sphinx ) - virtual/pkgconfig -" - -S="${WORKDIR}/${MY_P}" - -# bug 479092, requires networking -RESTRICT="test" - -src_prepare() { - default - - export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)" - - # Disable tests for now, bug 406399 - sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die - - # bug #220361 - rm aclocal.m4 || die - rm -rf libtool.m4/ || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --localstatedir="${EPREFIX}"/var - --without-python - --without-libjson - --without-zlib - --without-lmdb - --without-maxminddb - --disable-geoip - --with-openssl="${EPREFIX}"/usr - $(use_with idn libidn2) - $(use_with xml libxml2) - $(use_with gssapi) - $(use_with readline) - $(use_enable caps linux-caps) - AR="$(type -P $(tc-getAR))" - ) - - # bug 607400 - if use libedit ; then - myeconfargs+=( --with-readline=-ledit ) - elif use readline ; then - myeconfargs+=( --with-readline=-lreadline ) - else - myeconfargs+=( --without-readline ) - fi - - # bug 344029 - append-cflags "-DDIG_SIGCHASE" - - # to expose CMSG_* macros from sys/sockets.h - [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600" - - # localstatedir for nsupdate -l, bug 395785 - tc-export BUILD_CC - econf "${myeconfargs[@]}" - - # bug #151839 - echo '#undef SO_BSDCOMPAT' >> config.h -} - -src_compile() { - local AR=$(tc-getAR) - - emake AR="${AR}" -C lib/ - emake AR="${AR}" -C bin/delv/ - emake AR="${AR}" -C bin/dig/ - emake AR="${AR}" -C bin/nsupdate/ - emake AR="${AR}" -C bin/dnssec/ - emake -C doc/man/ man $(usev doc) -} - -src_install() { - local man_dir="${S}/doc/man" - local html_dir="${man_dir}/_build/html" - - dodoc README CHANGES - - cd "${S}"/bin/delv || die - dobin delv - doman ${man_dir}/delv.1 - - cd "${S}"/bin/dig || die - dobin dig host nslookup - doman ${man_dir}/{dig,host,nslookup}.1 - - cd "${S}"/bin/nsupdate || die - dobin nsupdate - doman ${man_dir}/nsupdate.1 - if use doc; then - docinto html - dodoc ${html_dir}/nsupdate.html - fi - - cd "${S}"/bin/dnssec || die - for tool in dsfromkey importkey keyfromlabel keygen \ - revoke settime signzone verify; do - dobin dnssec-"${tool}" - doman ${man_dir}/dnssec-"${tool}".8 - if use doc; then - docinto html - dodoc ${html_dir}/dnssec-"${tool}".html - fi - done -} diff --git a/net-dns/bind-tools/bind-tools-9.16.21.ebuild b/net-dns/bind-tools/bind-tools-9.16.21.ebuild deleted file mode 100644 index fdd10e501a52..000000000000 --- a/net-dns/bind-tools/bind-tools-9.16.21.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic toolchain-funcs - -MY_PN=${PN//-tools} -MY_PV=${PV/_p/-P} -MY_PV=${MY_PV/_rc/rc} -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" -HOMEPAGE="https://www.isc.org/software/bind" -SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz" - -LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+caps doc gssapi idn ipv6 libedit readline xml" -# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 - -COMMON_DEPEND=" - dev-libs/libuv:= - caps? ( sys-libs/libcap ) - dev-libs/openssl:= - xml? ( dev-libs/libxml2 ) - idn? ( net-dns/libidn2:= ) - gssapi? ( virtual/krb5 ) - libedit? ( dev-libs/libedit ) - !libedit? ( - readline? ( sys-libs/readline:= ) - ) -" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" - -# sphinx required for man-page and html creation -BDEPEND=" - doc? ( dev-python/sphinx ) - virtual/pkgconfig -" - -S="${WORKDIR}/${MY_P}" - -# bug 479092, requires networking -RESTRICT="test" - -src_prepare() { - default - - export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)" - - # Disable tests for now, bug 406399 - sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die - - # bug #220361 - rm aclocal.m4 || die - rm -rf libtool.m4/ || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --localstatedir="${EPREFIX}"/var - --without-python - --without-libjson - --without-zlib - --without-lmdb - --without-maxminddb - --disable-geoip - --with-openssl="${EPREFIX}"/usr - $(use_with idn libidn2) - $(use_with xml libxml2) - $(use_with gssapi) - $(use_with readline) - $(use_enable caps linux-caps) - AR="$(type -P $(tc-getAR))" - ) - - # bug 607400 - if use libedit ; then - myeconfargs+=( --with-readline=-ledit ) - elif use readline ; then - myeconfargs+=( --with-readline=-lreadline ) - else - myeconfargs+=( --without-readline ) - fi - - # bug 344029 - append-cflags "-DDIG_SIGCHASE" - - # to expose CMSG_* macros from sys/sockets.h - [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600" - - # localstatedir for nsupdate -l, bug 395785 - tc-export BUILD_CC - econf "${myeconfargs[@]}" - - # bug #151839 - echo '#undef SO_BSDCOMPAT' >> config.h -} - -src_compile() { - local AR=$(tc-getAR) - - emake AR="${AR}" -C lib/ - emake AR="${AR}" -C bin/delv/ - emake AR="${AR}" -C bin/dig/ - emake AR="${AR}" -C bin/nsupdate/ - emake AR="${AR}" -C bin/dnssec/ - emake -C doc/man/ man $(usev doc) -} - -src_install() { - local man_dir="${S}/doc/man" - local html_dir="${man_dir}/_build/html" - - dodoc README CHANGES - - cd "${S}"/bin/delv || die - dobin delv - doman ${man_dir}/delv.1 - - cd "${S}"/bin/dig || die - dobin dig host nslookup - doman ${man_dir}/{dig,host,nslookup}.1 - - cd "${S}"/bin/nsupdate || die - dobin nsupdate - doman ${man_dir}/nsupdate.1 - if use doc; then - docinto html - dodoc ${html_dir}/nsupdate.html - fi - - cd "${S}"/bin/dnssec || die - for tool in dsfromkey importkey keyfromlabel keygen \ - revoke settime signzone verify; do - dobin dnssec-"${tool}" - doman ${man_dir}/dnssec-"${tool}".8 - if use doc; then - docinto html - dodoc ${html_dir}/dnssec-"${tool}".html - fi - done -} diff --git a/net-dns/bind-tools/bind-tools-9.16.25.ebuild b/net-dns/bind-tools/bind-tools-9.16.25.ebuild deleted file mode 100644 index 95720a1a0c9b..000000000000 --- a/net-dns/bind-tools/bind-tools-9.16.25.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic toolchain-funcs - -MY_PN=${PN//-tools} -MY_PV=${PV/_p/-P} -MY_PV=${MY_PV/_rc/rc} -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" -HOMEPAGE="https://www.isc.org/software/bind" -SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz" - -LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+caps doc gssapi idn ipv6 libedit readline xml" -# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 - -COMMON_DEPEND=" - dev-libs/libuv:= - caps? ( sys-libs/libcap ) - dev-libs/openssl:= - xml? ( dev-libs/libxml2 ) - idn? ( net-dns/libidn2:= ) - gssapi? ( virtual/krb5 ) - libedit? ( dev-libs/libedit ) - !libedit? ( - readline? ( sys-libs/readline:= ) - ) -" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" - -# sphinx required for man-page and html creation -BDEPEND=" - doc? ( dev-python/sphinx ) - virtual/pkgconfig -" - -S="${WORKDIR}/${MY_P}" - -# bug 479092, requires networking -RESTRICT="test" - -src_prepare() { - default - - export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)" - - # Disable tests for now, bug 406399 - sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die - - # bug #220361 - rm aclocal.m4 || die - rm -rf libtool.m4/ || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --localstatedir="${EPREFIX}"/var - --without-python - --without-libjson - --without-zlib - --without-lmdb - --without-maxminddb - --disable-geoip - --with-openssl="${ESYSROOT}"/usr - $(use_with idn libidn2 "${ESYSROOT}"/usr) - $(use_with xml libxml2) - $(use_with gssapi) - $(use_with readline) - $(use_enable caps linux-caps) - AR="$(type -P $(tc-getAR))" - ) - - # bug 607400 - if use libedit ; then - myeconfargs+=( --with-readline=-ledit ) - elif use readline ; then - myeconfargs+=( --with-readline=-lreadline ) - else - myeconfargs+=( --without-readline ) - fi - - # bug 344029 - append-cflags "-DDIG_SIGCHASE" - - # to expose CMSG_* macros from sys/sockets.h - [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600" - - # localstatedir for nsupdate -l, bug 395785 - tc-export BUILD_CC - econf "${myeconfargs[@]}" - - # bug #151839 - echo '#undef SO_BSDCOMPAT' >> config.h -} - -src_compile() { - local AR=$(tc-getAR) - - emake AR="${AR}" -C lib/ - emake AR="${AR}" -C bin/delv/ - emake AR="${AR}" -C bin/dig/ - emake AR="${AR}" -C bin/nsupdate/ - emake AR="${AR}" -C bin/dnssec/ - emake -C doc/man/ man $(usev doc) -} - -src_install() { - local man_dir="${S}/doc/man" - local html_dir="${man_dir}/_build/html" - - dodoc README CHANGES - - cd "${S}"/bin/delv || die - dobin delv - doman ${man_dir}/delv.1 - - cd "${S}"/bin/dig || die - dobin dig host nslookup - doman ${man_dir}/{dig,host,nslookup}.1 - - cd "${S}"/bin/nsupdate || die - dobin nsupdate - doman ${man_dir}/nsupdate.1 - if use doc; then - docinto html - dodoc ${html_dir}/nsupdate.html - fi - - cd "${S}"/bin/dnssec || die - for tool in dsfromkey importkey keyfromlabel keygen \ - revoke settime signzone verify; do - dobin dnssec-"${tool}" - doman ${man_dir}/dnssec-"${tool}".8 - if use doc; then - docinto html - dodoc ${html_dir}/dnssec-"${tool}".html - fi - done -} diff --git a/net-dns/bind-tools/bind-tools-9.16.27.ebuild b/net-dns/bind-tools/bind-tools-9.16.42.ebuild index a928124efddb..1d420730c56f 100644 --- a/net-dns/bind-tools/bind-tools-9.16.27.ebuild +++ b/net-dns/bind-tools/bind-tools-9.16.42.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools flag-o-matic toolchain-funcs +inherit autotools flag-o-matic multiprocessing toolchain-funcs MY_PN=${PN//-tools} MY_PV=${PV/_p/-P} @@ -11,19 +11,23 @@ MY_PV=${MY_PV/_rc/rc} MY_P="${MY_PN}-${MY_PV}" DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" -HOMEPAGE="https://www.isc.org/software/bind" +HOMEPAGE="https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9" SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz" LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+caps doc gssapi idn ipv6 libedit readline xml" -# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 - +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="+caps doc gssapi idn libedit readline test xml" +# no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687 +RESTRICT="!test? ( test )" + +# libuv lower bound should be the highest value seen at +# https://gitlab.isc.org/isc-projects/bind9/-/blob/v9_16/lib/isc/netmgr/netmgr.c#L244 +# to avoid issues with matching stable/testing, etc COMMON_DEPEND=" - dev-libs/libuv:= - caps? ( sys-libs/libcap ) + >=dev-libs/libuv-1.42.0:= dev-libs/openssl:= + caps? ( sys-libs/libcap ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) @@ -37,27 +41,32 @@ RDEPEND="${COMMON_DEPEND}" # sphinx required for man-page and html creation BDEPEND=" - doc? ( dev-python/sphinx ) virtual/pkgconfig + doc? ( dev-python/sphinx ) + test? ( + dev-util/cmocka + dev-util/kyua + ) " S="${WORKDIR}/${MY_P}" -# bug 479092, requires networking -RESTRICT="test" - src_prepare() { default - export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)" - - # Disable tests for now, bug 406399 - sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die + append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)" # Do not disable thread local storage on Solaris, it works with our # toolchain, and it breaks further configure checks sed -i -e '/LDFLAGS=/s/-zrelax=transtls//' configure.ac configure || die + # Slow tests + sed -i "s/{name='mem_test'}/{name='mem_test',timeout=900}/" "lib/isc/tests/Kyuafile" || die + sed -i "s/{name='timer_test'}/{name='timer_test',timeout=900}/" "lib/isc/tests/Kyuafile" || die + + # Conditionally broken + use sparc && ( sed -i "/{name='netmgr_test'}/d" "lib/isc/tests/Kyuafile" || die ) + # bug #220361 rm aclocal.m4 || die rm -rf libtool.m4/ || die @@ -92,22 +101,22 @@ src_configure() { myeconfargs+=( --without-readline ) fi - # bug 344029 + # bug #344029 append-cflags "-DDIG_SIGCHASE" # to expose CMSG_* macros from sys/sockets.h [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600" - # localstatedir for nsupdate -l, bug 395785 + # localstatedir for nsupdate -l, bug #395785 tc-export BUILD_CC econf "${myeconfargs[@]}" # bug #151839 - echo '#undef SO_BSDCOMPAT' >> config.h + echo '#undef SO_BSDCOMPAT' >> config.h || die } src_compile() { - local AR=$(tc-getAR) + local AR="$(tc-getAR)" emake AR="${AR}" -C lib/ emake AR="${AR}" -C bin/delv/ @@ -117,6 +126,12 @@ src_compile() { emake -C doc/man/ man $(usev doc) } +src_test() { + # system tests ('emake test') require network configuration for IPs etc + # so we run the unit tests instead. + TEST_PARALLEL_JOBS="$(makeopts_jobs)" emake unit +} + src_install() { local man_dir="${S}/doc/man" local html_dir="${man_dir}/_build/html" diff --git a/net-dns/bind-tools/bind-tools-9.16.22.ebuild b/net-dns/bind-tools/bind-tools-9.16.48.ebuild index 2d254f1dda8c..aceb62a2e205 100644 --- a/net-dns/bind-tools/bind-tools-9.16.22.ebuild +++ b/net-dns/bind-tools/bind-tools-9.16.48.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools flag-o-matic toolchain-funcs +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/isc.asc +inherit autotools flag-o-matic multiprocessing toolchain-funcs verify-sig MY_PN=${PN//-tools} MY_PV=${PV/_p/-P} @@ -11,19 +12,27 @@ MY_PV=${MY_PV/_rc/rc} MY_P="${MY_PN}-${MY_PV}" DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen" -HOMEPAGE="https://www.isc.org/software/bind" -SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz" +HOMEPAGE="https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9" +SRC_URI=" + https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz + verify-sig? ( https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz.asc ) +" +S="${WORKDIR}/${MY_P}" LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+caps doc gssapi idn ipv6 libedit readline xml" -# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 - -COMMON_DEPEND=" - dev-libs/libuv:= - caps? ( sys-libs/libcap ) +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="+caps doc gssapi idn libedit readline test xml" +# no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687 +RESTRICT="!test? ( test )" + +# libuv lower bound should be the highest value seen at +# https://gitlab.isc.org/isc-projects/bind9/-/blob/bind-9.16/lib/isc/netmgr/netmgr.c?ref_type=heads#L244 +# to avoid issues with matching stable/testing, etc +RDEPEND=" + >=dev-libs/libuv-1.42.0:= dev-libs/openssl:= + caps? ( sys-libs/libcap ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) @@ -32,27 +41,31 @@ COMMON_DEPEND=" readline? ( sys-libs/readline:= ) ) " -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" - +DEPEND="${RDEPEND}" # sphinx required for man-page and html creation BDEPEND=" - doc? ( dev-python/sphinx ) virtual/pkgconfig + doc? ( dev-python/sphinx ) + test? ( + dev-util/cmocka + dev-util/kyua + ) + verify-sig? ( sec-keys/openpgp-keys-isc ) " -S="${WORKDIR}/${MY_P}" - -# bug 479092, requires networking -RESTRICT="test" - src_prepare() { default - export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)" + # Do not disable thread local storage on Solaris, it works with our + # toolchain, and it breaks further configure checks + sed -i -e '/LDFLAGS=/s/-zrelax=transtls//' configure.ac configure || die - # Disable tests for now, bug 406399 - sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die + # Slow tests + sed -i "s/{name='mem_test'}/{name='mem_test',timeout=900}/" "lib/isc/tests/Kyuafile" || die + sed -i "s/{name='timer_test'}/{name='timer_test',timeout=900}/" "lib/isc/tests/Kyuafile" || die + + # Conditionally broken + use sparc && ( sed -i "/{name='netmgr_test'}/d" "lib/isc/tests/Kyuafile" || die ) # bug #220361 rm aclocal.m4 || die @@ -63,6 +76,7 @@ src_prepare() { src_configure() { local myeconfargs=( + # localstatedir for nsupdate -l, bug #395785 --localstatedir="${EPREFIX}"/var --without-python --without-libjson @@ -79,7 +93,7 @@ src_configure() { AR="$(type -P $(tc-getAR))" ) - # bug 607400 + # bug #607400 if use libedit ; then myeconfargs+=( --with-readline=-ledit ) elif use readline ; then @@ -88,22 +102,23 @@ src_configure() { myeconfargs+=( --without-readline ) fi - # bug 344029 + # bug #344029 append-cflags "-DDIG_SIGCHASE" + append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)" + # to expose CMSG_* macros from sys/sockets.h [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600" - # localstatedir for nsupdate -l, bug 395785 tc-export BUILD_CC econf "${myeconfargs[@]}" # bug #151839 - echo '#undef SO_BSDCOMPAT' >> config.h + echo '#undef SO_BSDCOMPAT' >> config.h || die } src_compile() { - local AR=$(tc-getAR) + local AR="$(tc-getAR)" emake AR="${AR}" -C lib/ emake AR="${AR}" -C bin/delv/ @@ -113,6 +128,12 @@ src_compile() { emake -C doc/man/ man $(usev doc) } +src_test() { + # system tests ('emake test') require network configuration for IPs etc + # so we run the unit tests instead. + TEST_PARALLEL_JOBS="$(makeopts_jobs)" emake -Onone unit +} + src_install() { local man_dir="${S}/doc/man" local html_dir="${man_dir}/_build/html" @@ -136,6 +157,7 @@ src_install() { fi cd "${S}"/bin/dnssec || die + local tool for tool in dsfromkey importkey keyfromlabel keygen \ revoke settime signzone verify; do dobin dnssec-"${tool}" diff --git a/net-dns/bind-tools/metadata.xml b/net-dns/bind-tools/metadata.xml index 38322a5df432..b79cb1a4c1d9 100644 --- a/net-dns/bind-tools/metadata.xml +++ b/net-dns/bind-tools/metadata.xml @@ -2,14 +2,13 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>zlogene@gentoo.org</email> - <name>Mikle Kolyada</name> - </maintainer> - <maintainer type="person"> <email>chutzpah@gentoo.org</email> <name>Patrick McLean</name> </maintainer> <use> <flag name="gssapi">Enable gssapi support</flag> </use> + <upstream> + <remote-id type="cpe">cpe:/a:isc:bind</remote-id> + </upstream> </pkgmetadata> diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest index 65ab9a756419..4bd7778cc761 100644 --- a/net-dns/bind/Manifest +++ b/net-dns/bind/Manifest @@ -1,2 +1,4 @@ -DIST bind-9.16.27.tar.xz 5084340 BLAKE2B 37b49ce81aa5122493a4feb2bb7be53c5d46ff2ce28456aec31ce1332520a09c10bb2293c736bffe7badbc2bc3d156c05f83367678bd101e17b99ca3ff69bebf SHA512 5c71f228db83aa8cc9e65466d6e5afca4a9f80c693358111a003fe09e1a14522175eb2b6a0f11e2a2cd4fdba01f2ae315de52e394a441b3861ca2a011e02af62 +DIST bind-9.16.42.tar.xz 5123476 BLAKE2B 7cda7df38beaa602fde0142b46c8bcf401cda8afdf00383724ccaa8f3e3f71d320bbd4b7f3be33bcc9c59465932caab1f8c62ca64b79a1470cbdaa01f0048b00 SHA512 cf29e72c9c979f3cf8ba0b17357fb09c37f1436a7f3a518f49ce4b4c682fb367dd3d8e71de6603c166c95a7c535a77a9f2a1393a59723294626acefebbc95fd6 +DIST bind-9.16.48.tar.xz 5131176 BLAKE2B 4a503b45df412c435cb0f75b54ee1270140cccce7ecc159cdf3e0e3cbd3c0a0866b7472782f20aacf130f57df12d20a102ac6979498138ce00a2655806d003e7 SHA512 83829a5045e2a29dd2b491d3ab72b545f5664023fcd4aa205a44dbb7bcc5c737b4466c0d73f124b8d88fd33c56776871a07dde1ba0530d43eec8e7304a08d353 +DIST bind-9.16.48.tar.xz.asc 833 BLAKE2B 740ed58863ed3a7dee6ada4edd03cad5378ea0aa53cd6f071ca1911bb2d6b285ed292f32846790d42b97e8d9bb72588f1cd30c4e10557ac1e9f1df545923a9b1 SHA512 7bd813b5ab6f9677fc4ef21e0c3930f6319fa6c49d6869570794bc28212fe8935b72f9f217cfce692a2dec9ec29994f345d1b1145cef1ca976c5361f6ce0f75d DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac diff --git a/net-dns/bind/bind-9.16.27-r1.ebuild b/net-dns/bind/bind-9.16.42.ebuild index dfbad3bc56ac..66dc6a058d92 100644 --- a/net-dns/bind/bind-9.16.27-r1.ebuild +++ b/net-dns/bind/bind-9.16.42.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Re dlz/mysql and threads, needs to be verified.. @@ -10,11 +10,11 @@ # Because of this BIND MUST only run with a single thread when # using the MySQL driver. -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) -inherit python-r1 autotools toolchain-funcs flag-o-matic db-use systemd tmpfiles +inherit python-r1 autotools multiprocessing toolchain-funcs flag-o-matic db-use systemd tmpfiles MY_PV="${PV/_p/-P}" MY_PV="${MY_PV/_rc/rc}" @@ -27,18 +27,19 @@ RRL_PV="${MY_PV}" # SDB-LDAP: http://bind9-ldap.bayour.com/ DESCRIPTION="Berkeley Internet Name Domain - Name Server" -HOMEPAGE="https://www.isc.org/software/bind" +HOMEPAGE="https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9" SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz doc? ( mirror://gentoo/dyndns-samples.tbz2 )" LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -# -berkdb by default re bug 602682 +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +# -berkdb by default re bug #602682 IUSE="berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi -json ldap lmdb mysql odbc postgres python selinux static-libs xml +zlib" +json ldap lmdb mysql odbc postgres python selinux static-libs test xml +zlib" # sdb-ldap - patch broken # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 +RESTRICT="!test? ( test )" # Upstream dropped the old geoip library, but the BIND configuration for using # GeoIP remained the same. @@ -81,24 +82,31 @@ RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-bind ) sys-process/psmisc" +BDEPEND=" + test? ( + dev-util/cmocka + dev-util/kyua + ) +" + S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}/ldap-library-path-on-multilib-machines.patch" ) -# bug 479092, requires networking -# bug 710840, cmocka fails LDFLAGS='-Wl,-O1' -#RESTRICT="test" - src_prepare() { default - # should be installed by bind-tools + # Should be installed by bind-tools sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die - # Disable tests for now, bug 406399 - sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die + # Slow tests + sed -i "s/{name='mem_test'}/{name='mem_test',timeout=900}/" "lib/isc/tests/Kyuafile" || die + sed -i "s/{name='timer_test'}/{name='timer_test',timeout=900}/" "lib/isc/tests/Kyuafile" || die + + # Conditionally broken + use sparc && ( sed -i "/{name='netmgr_test'}/d" "lib/isc/tests/Kyuafile" || die ) # bug #220361 rm aclocal.m4 || die @@ -123,14 +131,13 @@ bind_configure() { --enable-full-report --without-readline --with-openssl="${ESYSROOT}"/usr - --without-cmocka + $(use_with test cmocka) # Removed in 9.17, drags in libunwind dependency too --disable-backtrace $(use_enable caps linux-caps) $(use_enable dnsrps) $(use_enable dnstap) $(use_enable fixed-rrset) - # $(use_enable static-libs static) $(use_with berkdb dlz-bdb "${ESYSROOT}"/usr) $(use_with dlz dlopen) $(use_with dlz dlz-filesystem) @@ -146,6 +153,7 @@ bind_configure() { $(use_with zlib) "${@}" ) + # This is for users to start to migrate back to USE=geoip, rather than # USE=geoip2 if use geoip ; then @@ -160,7 +168,7 @@ bind_configure() { fi # bug #158664 -# gcc-specs-ssp && replace-flags -O[23s] -O + #gcc-specs-ssp && replace-flags -O[23s] -O # To include db.h from proper path use berkdb && append-flags "-I$(db_includedir)" @@ -169,7 +177,7 @@ bind_configure() { econf "${myeconfargs[@]}" # bug #151839 - echo '#undef SO_BSDCOMPAT' >> config.h + echo '#undef SO_BSDCOMPAT' >> config.h || die } python_configure() { @@ -189,6 +197,12 @@ python_compile() { popd >/dev/null || die } +src_test() { + # system tests ('emake test') require network configuration for IPs etc + # so we run the unit tests instead. + TEST_PARALLEL_JOBS="$(makeopts_jobs)" emake unit +} + src_install() { default diff --git a/net-dns/bind/bind-9.16.48.ebuild b/net-dns/bind/bind-9.16.48.ebuild new file mode 100644 index 000000000000..76803d35e023 --- /dev/null +++ b/net-dns/bind/bind-9.16.48.ebuild @@ -0,0 +1,398 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Re dlz/mysql and threads, needs to be verified.. +# MySQL uses thread local storage in its C api. Thus MySQL +# requires that each thread of an application execute a MySQL +# thread initialization to setup the thread local storage. +# This is impossible to do safely while staying within the DLZ +# driver API. This is a limitation caused by MySQL, and not the DLZ API. +# Because of this BIND MUST only run with a single thread when +# using the MySQL driver. + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/isc.asc +inherit python-r1 autotools multiprocessing toolchain-funcs flag-o-matic db-use systemd tmpfiles verify-sig + +MY_PV="${PV/_p/-P}" +MY_PV="${MY_PV/_rc/rc}" +MY_P="${PN}-${MY_PV}" + +SDB_LDAP_VER="1.1.0-fc14" + +RRL_PV="${MY_PV}" + +# SDB-LDAP: http://bind9-ldap.bayour.com/ + +DESCRIPTION="Berkeley Internet Name Domain - Name Server" +HOMEPAGE="https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9" +SRC_URI=" + https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz + doc? ( mirror://gentoo/dyndns-samples.tbz2 ) + verify-sig? ( https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz.asc ) +" +S="${WORKDIR}/${MY_P}" + +LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +# -berkdb by default re bug #602682 +IUSE="berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi" +IUSE+=" json ldap lmdb mysql odbc postgres python selinux static-libs test xml +zlib" +# sdb-ldap - patch broken +# no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687 +RESTRICT="!test? ( test )" + +# Upstream dropped the old geoip library, but the BIND configuration for using +# GeoIP remained the same. +REQUIRED_USE=" + postgres? ( dlz ) + berkdb? ( dlz ) + mysql? ( dlz ) + odbc? ( dlz ) + ldap? ( dlz ) + dnsrps? ( dlz ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +DEPEND=" + acct-group/named + acct-user/named + dev-libs/libuv:= + berkdb? ( sys-libs/db:= ) + dev-libs/openssl:=[-bindist(-)] + mysql? ( dev-db/mysql-connector-c:0= ) + odbc? ( >=dev-db/unixODBC-2.2.6 ) + ldap? ( net-nds/openldap:= ) + postgres? ( dev-db/postgresql:= ) + caps? ( >=sys-libs/libcap-2.1.0 ) + xml? ( dev-libs/libxml2 ) + geoip? ( dev-libs/libmaxminddb:= ) + geoip2? ( dev-libs/libmaxminddb:= ) + gssapi? ( virtual/krb5 ) + json? ( dev-libs/json-c:= ) + lmdb? ( dev-db/lmdb:= ) + zlib? ( sys-libs/zlib ) + dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) + python? ( + ${PYTHON_DEPS} + dev-python/ply[${PYTHON_USEDEP}] + ) +" +RDEPEND=" + ${DEPEND} + sys-process/psmisc + selinux? ( sec-policy/selinux-bind ) +" +BDEPEND=" + test? ( + dev-util/cmocka + dev-util/kyua + ) + verify-sig? ( sec-keys/openpgp-keys-isc ) +" + +PATCHES=( + "${FILESDIR}/ldap-library-path-on-multilib-machines.patch" +) + +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc} + fi + default +} + +src_prepare() { + default + + # Should be installed by bind-tools + sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die + + # Slow tests + sed -i "s/{name='mem_test'}/{name='mem_test',timeout=900}/" "lib/isc/tests/Kyuafile" || die + sed -i "s/{name='timer_test'}/{name='timer_test',timeout=900}/" "lib/isc/tests/Kyuafile" || die + + # Conditionally broken + use sparc && ( sed -i "/{name='netmgr_test'}/d" "lib/isc/tests/Kyuafile" || die ) + + # bug #220361 + rm aclocal.m4 || die + rm -rf libtool.m4/ || die + eautoreconf + + use python && python_copy_sources +} + +src_configure() { + bind_configure --without-python + use python && python_foreach_impl python_configure +} + +bind_configure() { + local myeconfargs=( + AR="$(type -P $(tc-getAR))" + --prefix="${EPREFIX}"/usr + --sysconfdir=/etc/bind + --localstatedir=/var + --with-libtool + --enable-full-report + --without-readline + --with-openssl="${ESYSROOT}"/usr + $(use_with test cmocka) + # Removed in 9.17, drags in libunwind dependency too + --disable-backtrace + $(use_enable caps linux-caps) + $(use_enable dnsrps) + $(use_enable dnstap) + $(use_enable fixed-rrset) + $(use_with berkdb dlz-bdb "${ESYSROOT}"/usr) + $(use_with dlz dlopen) + $(use_with dlz dlz-filesystem) + $(use_with dlz dlz-stub) + $(use_with gssapi) + $(use_with json json-c) + $(use_with ldap dlz-ldap) + $(use_with mysql dlz-mysql) + $(use_with odbc dlz-odbc) + $(use_with postgres dlz-postgres) + $(use_with lmdb) + $(use_with xml libxml2) + $(use_with zlib) + "${@}" + ) + + # This is for users to start to migrate back to USE=geoip, rather than + # USE=geoip2 + if use geoip ; then + myeconfargs+=( $(use_with geoip maxminddb) --enable-geoip ) + elif use geoip2 ; then + # Added 2020/09/30 + # Remove USE=geoip2 support after 2020/03/01 + ewarn "USE=geoip2 is deprecated; update your USE flags!" + myeconfargs+=( $(use_with geoip2 maxminddb) --enable-geoip ) + else + myeconfargs+=( --without-maxminddb --disable-geoip ) + fi + + # bug #158664 + #gcc-specs-ssp && replace-flags -O[23s] -O + + # To include db.h from proper path + use berkdb && append-flags "-I$(db_includedir)" + + export BUILD_CC=$(tc-getBUILD_CC) + econf "${myeconfargs[@]}" + + # bug #151839 + echo '#undef SO_BSDCOMPAT' >> config.h || die +} + +python_configure() { + pushd "${BUILD_DIR}" >/dev/null || die + bind_configure --with-python + popd >/dev/null || die +} + +src_compile() { + default + use python && python_foreach_impl python_compile +} + +python_compile() { + emake -C "${BUILD_DIR}"/bin/python +} + +src_test() { + # system tests ('emake test') require network configuration for IPs etc + # so we run the unit tests instead. + TEST_PARALLEL_JOBS="$(makeopts_jobs)" emake -Onone unit +} + +src_install() { + default + + dodoc CHANGES README + + if use doc; then + docinto misc + dodoc -r doc/misc/ + + # might a 'html' useflag make sense? + docinto html + dodoc -r doc/arm/ + + docinto contrib + dodoc contrib/scripts/{nanny.pl,named-bootconf.sh} + + # some handy-dandy dynamic dns examples + pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die + tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die + popd 1>/dev/null || die + fi + + insinto /etc/bind + newins "${FILESDIR}"/named.conf-r8 named.conf + + # ftp://ftp.rs.internic.net/domain/named.cache: + insinto /var/bind + newins "${FILESDIR}"/named.cache-r4 named.cache + + insinto /var/bind/pri + newins "${FILESDIR}"/localhost.zone-r3 localhost.zone + + newinitd "${FILESDIR}"/named.init-r14 named + newconfd "${FILESDIR}"/named.confd-r7 named + + newenvd "${FILESDIR}"/10bind.env 10bind + + # Let's get rid of those tools and their manpages since they're provided by bind-tools + rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup,delv,nsupdate}.1* || die + rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die + rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die + rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die + for tool in dsfromkey importkey keyfromlabel keygen \ + revoke settime signzone verify; do + rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die + rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die + done + + # bug 405251, library archives aren't properly handled by --enable/disable-static + if ! use static-libs; then + find "${ED}" -type f -name '*.a' -delete || die + fi + + # bug 405251 + find "${ED}" -type f -name '*.la' -delete || die + + use python && python_foreach_impl python_install + + # bug 450406 + dosym named.cache /var/bind/root.cache + + dosym ../../var/bind/pri /etc/bind/pri + dosym ../../var/bind/sec /etc/bind/sec + dosym ../../var/bind/dyn /etc/bind/dyn + keepdir /var/bind/{pri,sec,dyn} /var/log/named + + fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn} + fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf} + fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf} + fperms 0750 /etc/bind /var/bind/pri + fperms 0770 /var/log/named /var/bind/{,sec,dyn} + + systemd_newunit "${FILESDIR}/named.service-r1" named.service + dotmpfiles "${FILESDIR}"/named.conf + exeinto /usr/libexec + doexe "${FILESDIR}/generate-rndc-key.sh" +} + +python_install() { + pushd "${BUILD_DIR}"/bin/python >/dev/null || die + emake DESTDIR="${D}" install + python_scriptinto /usr/sbin + python_doscript dnssec-{checkds,coverage} + python_optimize + popd >/dev/null || die +} + +pkg_postinst() { + tmpfiles_process named.conf + + if [[ ! -f '/etc/bind/rndc.key' && ! -f '/etc/bind/rndc.conf' ]]; then + einfo "Using /dev/urandom for generating rndc.key" + /usr/sbin/rndc-confgen -a + chown root:named /etc/bind/rndc.key || die + chmod 0640 /etc/bind/rndc.key || die + fi + + einfo + einfo "You can edit /etc/conf.d/named to customize named settings" + einfo + use mysql || use postgres || use ldap && { + elog "If your named depends on MySQL/PostgreSQL or LDAP," + elog "uncomment the specified rc_named_* lines in your" + elog "/etc/conf.d/named config to ensure they'll start before bind" + einfo + } + einfo "If you'd like to run bind in a chroot AND this is a new" + einfo "install OR your bind doesn't already run in a chroot:" + einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named." + einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`" + einfo + + CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT}) + if [[ -n ${CHROOT} ]]; then + elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!" + elog "To enable the old behaviour (without using mount) uncomment the" + elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config." + elog "If you decide to use the new/default method, ensure to make backup" + elog "first and merge your existing configs/zones to /etc/bind and" + elog "/var/bind because bind will now mount the needed directories into" + elog "the chroot dir." + fi +} + +pkg_config() { + CHROOT=$(source /etc/conf.d/named; echo ${CHROOT}) + CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT}) + CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP}) + + if [[ -z "${CHROOT}" ]]; then + eerror "This config script is designed to automate setting up" + eerror "a chrooted bind/named. To do so, please first uncomment" + eerror "and set the CHROOT variable in '/etc/conf.d/named'." + die "Unset CHROOT" + fi + if [[ -d "${CHROOT}" ]]; then + ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!" + ewarn "To enable the old behaviour (without using mount) uncomment the" + ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config." + ewarn + ewarn "${CHROOT} already exists... some things might become overridden" + ewarn "press CTRL+C if you don't want to continue" + sleep 10 + fi + + echo; einfo "Setting up the chroot directory..." + + mkdir -m 0750 -p ${CHROOT} || die + mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die + mkdir -m 0750 -p ${CHROOT}/etc/bind || die + mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die + + chown root:named \ + ${CHROOT} \ + ${CHROOT}/var/{bind,log/named} \ + ${CHROOT}/run/named/ \ + ${CHROOT}/etc/bind \ + || die + + mknod ${CHROOT}/dev/null c 1 3 || die + chmod 0666 ${CHROOT}/dev/null || die + + mknod ${CHROOT}/dev/zero c 1 5 || die + chmod 0666 ${CHROOT}/dev/zero || die + + mknod ${CHROOT}/dev/urandom c 1 9 || die + chmod 0666 ${CHROOT}/dev/urandom || die + + if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then + cp -a /etc/bind ${CHROOT}/etc/ || die + cp -a /var/bind ${CHROOT}/var/ || die + fi + + if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then + if use geoip; then + mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die + elif use geoip2; then + mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP2 || die + fi + fi + + elog "You may need to add the following line to your syslog-ng.conf:" + elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };" +} diff --git a/net-dns/bind/files/named.cache-r4 b/net-dns/bind/files/named.cache-r4 new file mode 100644 index 000000000000..860b808e119a --- /dev/null +++ b/net-dns/bind/files/named.cache-r4 @@ -0,0 +1,92 @@ +; This file holds the information on root name servers needed to +; initialize cache of Internet domain name servers +; (e.g. reference this file in the "cache . <file>" +; configuration file of BIND domain name servers). +; +; This file is made available by InterNIC +; under anonymous FTP as +; file /domain/named.cache +; on server FTP.INTERNIC.NET +; -OR- RS.INTERNIC.NET +; +; last update: January 24, 2024 +; related version of root zone: 2024012401 +; +; FORMERLY NS.INTERNIC.NET +; +. 3600000 NS A.ROOT-SERVERS.NET. +A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4 +A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:ba3e::2:30 +; +; FORMERLY NS1.ISI.EDU +; +. 3600000 NS B.ROOT-SERVERS.NET. +B.ROOT-SERVERS.NET. 3600000 A 170.247.170.2 +B.ROOT-SERVERS.NET. 3600000 AAAA 2801:1b8:10::b +; +; FORMERLY C.PSI.NET +; +. 3600000 NS C.ROOT-SERVERS.NET. +C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 +C.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2::c +; +; FORMERLY TERP.UMD.EDU +; +. 3600000 NS D.ROOT-SERVERS.NET. +D.ROOT-SERVERS.NET. 3600000 A 199.7.91.13 +D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2d::d +; +; FORMERLY NS.NASA.GOV +; +. 3600000 NS E.ROOT-SERVERS.NET. +E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10 +E.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:a8::e +; +; FORMERLY NS.ISC.ORG +; +. 3600000 NS F.ROOT-SERVERS.NET. +F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241 +F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f +; +; FORMERLY NS.NIC.DDN.MIL +; +. 3600000 NS G.ROOT-SERVERS.NET. +G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4 +G.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:12::d0d +; +; FORMERLY AOS.ARL.ARMY.MIL +; +. 3600000 NS H.ROOT-SERVERS.NET. +H.ROOT-SERVERS.NET. 3600000 A 198.97.190.53 +H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::53 +; +; FORMERLY NIC.NORDU.NET +; +. 3600000 NS I.ROOT-SERVERS.NET. +I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 +I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fe::53 +; +; OPERATED BY VERISIGN, INC. +; +. 3600000 NS J.ROOT-SERVERS.NET. +J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 +J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:c27::2:30 +; +; OPERATED BY RIPE NCC +; +. 3600000 NS K.ROOT-SERVERS.NET. +K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 +K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1 +; +; OPERATED BY ICANN +; +. 3600000 NS L.ROOT-SERVERS.NET. +L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 +L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:9f::42 +; +; OPERATED BY WIDE +; +. 3600000 NS M.ROOT-SERVERS.NET. +M.ROOT-SERVERS.NET. 3600000 A 202.12.27.33 +M.ROOT-SERVERS.NET. 3600000 AAAA 2001:dc3::35 +; End of file
\ No newline at end of file diff --git a/net-dns/bind/metadata.xml b/net-dns/bind/metadata.xml index 4fbef88c636a..ec13f291d0cd 100644 --- a/net-dns/bind/metadata.xml +++ b/net-dns/bind/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>zlogene@gentoo.org</email> - <name>Mikle Kolyada</name> - </maintainer> - <maintainer type="person"> <email>chutzpah@gentoo.org</email> <name>Patrick McLean</name> </maintainer> diff --git a/net-dns/c-ares/Manifest b/net-dns/c-ares/Manifest index 5cde624b8679..1ac95af8968c 100644 --- a/net-dns/c-ares/Manifest +++ b/net-dns/c-ares/Manifest @@ -1,2 +1,8 @@ -DIST c-ares-1.17.2.tar.gz 1538276 BLAKE2B c6f5ad65ca75f8467b624daf3caaee2f35d6e4714ce46ebe1bbf79447feecf8615915b00fa5e7bd1e97c6232864e06c53a792fbadf36a5399883529769273e24 SHA512 f625e0ef8508af6475d3e83b51ab29be8a4878e2a87e7f518bea046b76a74bfde7043ca6ec2a9e714c898ab9e5d4a5a678c3347a9f9eb68980438f7ca8ae3fc8 -DIST c-ares-1.18.1.tar.gz 1560165 BLAKE2B c03a572726c6bbb24a3e4773673d0c87f4833bb9582aed57a424eea8c965beb6e232f502b61922b124d37403d91ebfefe0db7373673fc22e0d752c4e5036eb07 SHA512 1276ec0799916019f8c0af6b55a139701bd15e0ca4a00811d07963893978bc96c107b980f0fd49f81aa70bc8b3b8cd671195ba357c390772d4c2c5643c50c5a5 +DIST c-ares-1.25.0.tar.gz 1264129 BLAKE2B a4f4b493e1331ade27504238c3e520e1ffaa525baf99442c88de3aeda1eb06a12ec804a5f0f699fb8acd469ccd2b3d08f5c32b4d01d50cfdc31097665087fce9 SHA512 f73ffc45c17f1e952ea5fae8a1d9e1508427f21c821ff470ff0b728cc4a1e21d1274f95d9192c22f704bc7e0f58a633608cfdc1704dfe8950902fdfc3dfa2e1c +DIST c-ares-1.25.0.tar.gz.asc 488 BLAKE2B 45b07fc1ef14452b8a4fda63f134e389b66c120ccd8de3d48ccc5659c481db1796339a1968db406cf9b3da1a9c5aa81ccf538bc0546bb6c4babbe7de9c14f576 SHA512 9cf2dcd80807b54cd7fa6871283863384a4b6b10e0ef9c287bb4969a9169b7f12180a15c5fa756770c5ba01558ef48615aaaaefa546d19b3496e3cbe0454346b +DIST c-ares-1.26.0.tar.gz 1298394 BLAKE2B 9bcbb321b31518fdd3481447e1bba733dbf0eabd1876aa0fec6737888fd176b837c64e6b22ae5754a905f0fd1591d4fd516db558fafae92cc2684ad7e0c29f63 SHA512 81657b8b9840a565b04ecf87ef8f0fc3192a9594808e47aed5e5bbebf2b5f0066b0cd5fae70f0fe70b68d428b4cc75fba22d2ae7683c6d0f87979c414c072af1 +DIST c-ares-1.26.0.tar.gz.asc 488 BLAKE2B 89c420ed235dce86c3d18ce62b58f50b78abf919c178e9a786fce5ee11da2b7a1314f8eb76bef20df0e43d18f636508540d9a9d2dfcd84df0c62691497f3a9a0 SHA512 84cd9918c22346a975400f17bf64e5093aa7b2d8f3377799cde5f6ab508e8f5ab6a004497747b702b7249b2b1369cdd22149519da01a405cf928806007e7a599 +DIST c-ares-1.27.0.tar.gz 1301440 BLAKE2B 112bf16288efc3ca1c69216de6bb42fdfc5348e70879321fb27f9602a8f469a21fa502a1cdd2f935e4ad0505ea7e22bd3a3326ce83bdb2acbe5ff266fc11cc6f SHA512 d0bffeeabdc5f1d4cececd46bd495b8224a64eaaf6d2a91c5475517440effe0e096146a1ebf19ece07367198be576c61b11961d5e4c3f601c5c5529ce4fcb46a +DIST c-ares-1.27.0.tar.gz.asc 488 BLAKE2B 64798140a1d61e32ba45467034d9da75abd8f48810643947c94b04dcaae1b8c68da7a6d9acb7476808601acfe6a527b2cd855d99912f5ac069a597b9c9c890e3 SHA512 dbaa2e96035283e55c7a3c940255d9cc81d98961f59a10586cd666525a0fddf0e3ada01fd79133a278159f47c344bce70bcc4ad1b5df5c853273941b744357e4 +DIST c-ares-1.28.1.tar.gz 1312102 BLAKE2B 2d0f12aeb4b947f76fe6c45e2bb0a7401c5d3ae5c84a94f2387f05b639587275e12cb0a2798caa381726e37757973b28c543249f9528b60746b8bf543a70be77 SHA512 9a24f40002b661d97c9b49a617d2e6b12bad1c9f22e872611252d051ec650f886c010207939fac6992610b3cd5a87588f802d7dfa1310ced7c6621ea2f99dd90 +DIST c-ares-1.28.1.tar.gz.asc 488 BLAKE2B 90f3aedc3b56f31519a9b2746e528bb952364748b6053ecebaa3edf4269aab6b3badad459a14e8afe623340b294fd072b13c60af540eb59d7f4d82eb5204be83 SHA512 62659e3c41ea7158c7fdaab3246fee6a6a1502dec12d322efd353e5a0fb1b0aa4c1caf7ace37e1d3ea0b2937522814fdf66af2d19a501e9b9995b86e2369410d diff --git a/net-dns/c-ares/c-ares-1.17.2.ebuild b/net-dns/c-ares/c-ares-1.17.2.ebuild deleted file mode 100644 index 631a0a16598d..000000000000 --- a/net-dns/c-ares/c-ares-1.17.2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal - -DESCRIPTION="C library that resolves names asynchronously" -HOMEPAGE="https://c-ares.haxx.se/" -SRC_URI="https://${PN}.haxx.se/download/${P}.tar.gz" - -# Subslot = SONAME of libcares.so.2 -SLOT="0/2" -LICENSE="MIT" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris" -IUSE="static-libs test" -RESTRICT="!test? ( test )" - -DOCS=( AUTHORS CHANGES NEWS README.md RELEASE-NOTES TODO ) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/ares_build.h -) - -multilib_src_configure() { - # Needed for running unit tests only - # Violates sandbox and tests pass fine without - ax_cv_uts_namespace=no \ - ax_cv_user_namespace=no \ - ECONF_SOURCE="${S}" \ - econf \ - --enable-nonblocking \ - --enable-symbol-hiding \ - $(use_enable static-libs static) \ - $(use_enable test tests) -} - -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* - ) - - # The format for disabling test1, test2, and test3 looks like: - # -test1:test2:test3 - ./arestest --gtest_filter=-$(echo $(IFS=:; echo "${network_tests[*]}")) || die "arestest failed!" -} - -multilib_src_install_all() { - einstalldocs - - find "${ED}" -name "*.la" -delete || die -} diff --git a/net-dns/c-ares/c-ares-1.18.1.ebuild b/net-dns/c-ares/c-ares-1.18.1.ebuild deleted file mode 100644 index a344ab8ed3e2..000000000000 --- a/net-dns/c-ares/c-ares-1.18.1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal - -DESCRIPTION="C library that resolves names asynchronously" -HOMEPAGE="https://c-ares.haxx.se/" -SRC_URI="https://${PN}.haxx.se/download/${P}.tar.gz" - -# Subslot = SONAME of libcares.so.2 -SLOT="0/2" -LICENSE="MIT" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris" -IUSE="static-libs test" -RESTRICT="!test? ( test )" - -DOCS=( AUTHORS CHANGES NEWS README.md RELEASE-NOTES TODO ) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/ares_build.h -) - -multilib_src_configure() { - # Needed for running unit tests only - # Violates sandbox and tests pass fine without - ax_cv_uts_namespace=no \ - ax_cv_user_namespace=no \ - ECONF_SOURCE="${S}" \ - econf \ - --enable-nonblocking \ - --enable-symbol-hiding \ - $(use_enable static-libs static) \ - $(use_enable test tests) -} - -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* - ) - - # The format for disabling test1, test2, and test3 looks like: - # -test1:test2:test3 - ./arestest --gtest_filter=-$(echo $(IFS=:; echo "${network_tests[*]}")) || die "arestest failed!" -} - -multilib_src_install_all() { - einstalldocs - - find "${ED}" -name "*.la" -delete || die -} diff --git a/net-dns/c-ares/c-ares-1.25.0-r1.ebuild b/net-dns/c-ares/c-ares-1.25.0-r1.ebuild new file mode 100644 index 000000000000..e5dd49ff97fb --- /dev/null +++ b/net-dns/c-ares/c-ares-1.25.0-r1.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/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=" + test? ( dev-cpp/gtest ) + verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) +" + +DOCS=( AUTHORS CHANGES NEWS README.md RELEASE-NOTES TODO ) + +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 +) + +PATCHES=( + "${FILESDIR}"/${P}-fix-sanity-check-rr.patch +) + +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/c-ares/c-ares-1.26.0.ebuild b/net-dns/c-ares/c-ares-1.26.0.ebuild new file mode 100644 index 000000000000..fd6862db0584 --- /dev/null +++ b/net-dns/c-ares/c-ares-1.26.0.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/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=" + test? ( dev-cpp/gtest ) + verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) +" + +DOCS=( AUTHORS CHANGES NEWS README.md RELEASE-NOTES.md TODO ) + +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/c-ares/c-ares-1.27.0.ebuild b/net-dns/c-ares/c-ares-1.27.0.ebuild new file mode 100644 index 000000000000..f066b76c4ef8 --- /dev/null +++ b/net-dns/c-ares/c-ares-1.27.0.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/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=" + test? ( dev-cpp/gtest ) + verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) +" + +DOCS=( AUTHORS CHANGES NEWS README.md RELEASE-NOTES.md TODO ) + +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/c-ares/c-ares-1.28.1.ebuild b/net-dns/c-ares/c-ares-1.28.1.ebuild new file mode 100644 index 000000000000..f066b76c4ef8 --- /dev/null +++ b/net-dns/c-ares/c-ares-1.28.1.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/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=" + test? ( dev-cpp/gtest ) + verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) +" + +DOCS=( AUTHORS CHANGES NEWS README.md RELEASE-NOTES.md TODO ) + +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/c-ares/files/c-ares-1.25.0-fix-sanity-check-rr.patch b/net-dns/c-ares/files/c-ares-1.25.0-fix-sanity-check-rr.patch new file mode 100644 index 000000000000..9b494ebfe8fe --- /dev/null +++ b/net-dns/c-ares/files/c-ares-1.25.0-fix-sanity-check-rr.patch @@ -0,0 +1,166 @@ +https://github.com/c-ares/c-ares/issues/683 +https://github.com/c-ares/c-ares/commit/626dcb155b4daf3360e4251c64ce052e7e520b34 + +From 626dcb155b4daf3360e4251c64ce052e7e520b34 Mon Sep 17 00:00:00 2001 +From: Brad House <brad@brad-house.com> +Date: Fri, 12 Jan 2024 09:55:42 -0500 +Subject: [PATCH] Do not sanity check RR Name vs Question (#685) + +It appears as though we should never sanity check the RR name vs the question name as some DNS servers may return results for alias records. + +Fixes Bug: #683 +Fix By: Brad House (@bradh352) +--- a/src/lib/ares__parse_into_addrinfo.c ++++ b/src/lib/ares__parse_into_addrinfo.c +@@ -81,7 +81,6 @@ ares_status_t ares__parse_into_addrinfo(const unsigned char *abuf, size_t alen, + } + + for (i = 0; i < ancount; i++) { +- const char *rname = NULL; + ares_dns_rec_type_t rtype; + const ares_dns_rr_t *rr = + ares_dns_record_rr_get(dnsrec, ARES_SECTION_ANSWER, i); +@@ -91,13 +90,18 @@ ares_status_t ares__parse_into_addrinfo(const unsigned char *abuf, size_t alen, + } + + rtype = ares_dns_rr_get_type(rr); +- rname = ares_dns_rr_get_name(rr); + +- /* Old code did this hostname sanity check */ +- if ((rtype == ARES_REC_TYPE_A || rtype == ARES_REC_TYPE_AAAA) && +- strcasecmp(rname, hostname) != 0) { +- continue; +- } ++ /* Issue #683 ++ * Old code did this hostname sanity check, however it appears this is ++ * flawed logic. Other resolvers don't do this sanity check. Leaving ++ * this code commented out for future reference. ++ * ++ * rname = ares_dns_rr_get_name(rr); ++ * if ((rtype == ARES_REC_TYPE_A || rtype == ARES_REC_TYPE_AAAA) && ++ * strcasecmp(rname, hostname) != 0) { ++ * continue; ++ * } ++ */ + + if (rtype == ARES_REC_TYPE_CNAME) { + struct ares_addrinfo_cname *cname; +--- a/src/lib/ares_parse_ptr_reply.c ++++ b/src/lib/ares_parse_ptr_reply.c +@@ -113,7 +113,6 @@ int ares_parse_ptr_reply(const unsigned char *abuf, int alen_int, + + /* Cycle through answers */ + for (i = 0; i < ancount; i++) { +- const char *rname = NULL; + const ares_dns_rr_t *rr = + ares_dns_record_rr_get(dnsrec, ARES_SECTION_ANSWER, i); + +@@ -141,17 +140,20 @@ int ares_parse_ptr_reply(const unsigned char *abuf, int alen_int, + continue; + } + +- /* Old code compared the name in the rr to the ptrname, so we'll do that +- * check here, but I'm not sure its necessary */ +- rname = ares_dns_rr_get_name(rr); +- if (rname == NULL) { +- /* Shouldn't be possible */ +- status = ARES_EBADRESP; +- goto done; +- } +- if (strcasecmp(ptrname, rname) != 0) { +- continue; +- } ++ /* Issue #683 ++ * Old code compared the name in the rr to the ptrname, but I think this ++ * is wrong since it was proven wrong for A & AAAA records. Leaving ++ * this code commented out for future reference ++ * ++ * rname = ares_dns_rr_get_name(rr); ++ * if (rname == NULL) { ++ * status = ARES_EBADRESP; ++ * goto done; ++ * } ++ * if (strcasecmp(ptrname, rname) != 0) { ++ * continue; ++ * } ++ */ + + /* Save most recent PTR record as the hostname */ + hostname = ares_dns_rr_get_str(rr, ARES_RR_PTR_DNAME); +--- a/test/ares-test-parse-a.cc ++++ b/test/ares-test-parse-a.cc +@@ -312,13 +312,19 @@ TEST_F(LibraryTest, ParseAReplyErrors) { + EXPECT_EQ(nullptr, host); + pkt.add_question(new DNSQuestion("example.com", T_A)); + +- // Question != answer ++ // Question != answer, this is ok as of Issue #683 + pkt.questions_.clear(); + pkt.add_question(new DNSQuestion("Axample.com", T_A)); + data = pkt.data(); +- EXPECT_EQ(ARES_ENODATA, ares_parse_a_reply(data.data(), (int)data.size(), ++ EXPECT_EQ(ARES_SUCCESS, ares_parse_a_reply(data.data(), (int)data.size(), + &host, info, &count)); +- EXPECT_EQ(nullptr, host); ++ ASSERT_NE(nullptr, host); ++ std::stringstream ss; ++ ss << HostEnt(host); ++ EXPECT_EQ("{'Axample.com' aliases=[] addrs=[2.3.4.5]}", ss.str()); ++ ares_free_hostent(host); ++ host = nullptr; ++ + pkt.questions_.clear(); + pkt.add_question(new DNSQuestion("example.com", T_A)); + +--- a/test/ares-test-parse-aaaa.cc ++++ b/test/ares-test-parse-aaaa.cc +@@ -139,13 +139,19 @@ TEST_F(LibraryTest, ParseAaaaReplyErrors) { + EXPECT_EQ(nullptr, host); + pkt.add_question(new DNSQuestion("example.com", T_AAAA)); + +- // Question != answer ++ // Question != answer, this is ok as of Issue #683 + pkt.questions_.clear(); + pkt.add_question(new DNSQuestion("Axample.com", T_AAAA)); + data = pkt.data(); +- EXPECT_EQ(ARES_ENODATA, ares_parse_aaaa_reply(data.data(), (int)data.size(), ++ EXPECT_EQ(ARES_SUCCESS, ares_parse_aaaa_reply(data.data(), (int)data.size(), + &host, info, &count)); +- EXPECT_EQ(nullptr, host); ++ ASSERT_NE(nullptr, host); ++ std::stringstream ss; ++ ss << HostEnt(host); ++ EXPECT_EQ("{'Axample.com' aliases=[] addrs=[0101:0101:0202:0202:0303:0303:0404:0404]}", ss.str()); ++ ares_free_hostent(host); ++ ++ host = nullptr; + pkt.questions_.clear(); + pkt.add_question(new DNSQuestion("example.com", T_AAAA)); + +--- a/test/ares-test-parse-ptr.cc ++++ b/test/ares-test-parse-ptr.cc +@@ -163,13 +163,20 @@ TEST_F(LibraryTest, ParsePtrReplyErrors) { + addrv4, sizeof(addrv4), AF_INET, &host)); + pkt.add_question(new DNSQuestion("64.48.32.16.in-addr.arpa", T_PTR)); + +- // Question != answer ++ // Question != answer, ok after #683 ++ host = nullptr; + pkt.questions_.clear(); + pkt.add_question(new DNSQuestion("99.48.32.16.in-addr.arpa", T_PTR)); + data = pkt.data(); +- EXPECT_EQ(ARES_ENODATA, ares_parse_ptr_reply(data.data(), (int)data.size(), ++ EXPECT_EQ(ARES_SUCCESS, ares_parse_ptr_reply(data.data(), (int)data.size(), + addrv4, sizeof(addrv4), AF_INET, &host)); +- EXPECT_EQ(nullptr, host); ++ ASSERT_NE(nullptr, host); ++ std::stringstream ss; ++ ss << HostEnt(host); ++ EXPECT_EQ("{'other.com' aliases=[other.com] addrs=[16.32.48.64]}", ss.str()); ++ ares_free_hostent(host); ++ ++ host = nullptr; + pkt.questions_.clear(); + pkt.add_question(new DNSQuestion("64.48.32.16.in-addr.arpa", T_PTR)); + + diff --git a/net-dns/c-ares/metadata.xml b/net-dns/c-ares/metadata.xml index 61b0198022c7..38e54d9f2ee6 100644 --- a/net-dns/c-ares/metadata.xml +++ b/net-dns/c-ares/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> -</maintainer> -<upstream> - <remote-id type="cpe">cpe:/a:daniel_stenberg:c-ares</remote-id> -</upstream> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <upstream> + <remote-id type="cpe">cpe:/a:daniel_stenberg:c-ares</remote-id> + <remote-id type="github">c-ares/c-ares</remote-id> + </upstream> </pkgmetadata> diff --git a/net-dns/coredns/Manifest b/net-dns/coredns/Manifest index 74f2a56dbba8..9f5b7a662200 100644 --- a/net-dns/coredns/Manifest +++ b/net-dns/coredns/Manifest @@ -1,2 +1,3 @@ -DIST coredns-1.8.3-deps.tar.xz 160097444 BLAKE2B e7c59bc3b732b84211bb2142edf6953eec839adac239b92082eb86aebd6d3f31b7e736000ba789836acc0cd88c3beda30b6f208f1192a878889399c43328c1ef SHA512 9b519214762aee3c28071a21cc052ecfa32b001cca56b99f5fe675a0cc6c08aadb68bfe0bedf39ca87040d18c906b9e2c8829acd9741b3b1e333d6c27ae7fa74 -DIST coredns-1.8.3.tar.gz 553278 BLAKE2B 8dddf12686e498f937c057a2fd539ff455980deef1dc889f8e7f6891a712dedb4089528c0a228240332603a37040ab22f80e17af38998a73757f9d1c18d28064 SHA512 2cc2754e9e626d40a2101f17744e8c57bd6d469eacbb4cfee965c2bf485156ae91f4cc99f8e63b5641163e8716c9614b6f9481fb91acb96e62951044bdac1fa8 +DIST coredns-1.11.2-deps.tar.xz 261482588 BLAKE2B 39e30800ac1fc404dc60f859b929c4a69614b9f0be8937c3fd7b1a872ec1e163ab4f6a313ed7661d2a101318187aaa2419168c0511cf2108c43ada38db0d1e0b SHA512 91282766d10d28d564d14fb20d8d82808507e509c58b7bb1959bb03a2665a287057aa4d547bfc8cc60ff080eea807af1c57d86bf9ff000125ef0642d8557e47f +DIST coredns-1.11.2-r1-deps.tar.xz 6547080 BLAKE2B 19a067a5b402ebe3b8a462e534bbdcf9baade4b5f434c6f24fe8ede0cbe623e2d5d8bdf0ffc06954d796441095688f19caa40f2255a2cc56102fdef36d327ac5 SHA512 caf6e0f1c9be4857059244019d6556f907e4f6907a932c201c856355c3e0b86c1752a90a226d5904c511d0db08ce4869cc5d24203bb4b9e2e1be02e725990332 +DIST coredns-1.11.2.tar.gz 651994 BLAKE2B 1a7a272756eaf83170e242a573c8a765d6ea7b70fe422d36a87850b600a88287291aa0fe0d49462c34453d4d3c4d33f9497be409379ff8fccc87f41e2195efc1 SHA512 0e90ef4793555bd46aa5ce84cf639c015d1869b407627c69746eb948abff1920f891c45e5f00c0127f23e2c6394c07cc55c1776af840881210f90faa6ec22b40 diff --git a/net-dns/coredns/coredns-1.11.2-r1.ebuild b/net-dns/coredns/coredns-1.11.2-r1.ebuild new file mode 100644 index 000000000000..745049a5ed09 --- /dev/null +++ b/net-dns/coredns/coredns-1.11.2-r1.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit fcaps go-module multiprocessing systemd tmpfiles toolchain-funcs + +DESCRIPTION="CoreDNS is a DNS server that chains plugins" +HOMEPAGE="https://github.com/coredns/coredns" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/coredns/coredns.git" +else + #SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + # The v1.11.2 tag went missing upstream, so use a previously fetched copy. + SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.gz" + SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${PF}-deps.tar.xz" + KEYWORDS="~amd64" +fi + +# main +LICENSE="Apache-2.0" +# deps +LICENSE+=" MIT BSD ISC MPL-2.0 BSD-2" + +SLOT="0" +IUSE="test" +# TODO: debug test failure with deps tarball +RESTRICT="test" + +RDEPEND="acct-user/coredns + acct-group/coredns" + +FILECAPS=( + -m 755 'cap_net_bind_service=+ep' usr/bin/${PN} +) + +src_unpack() { + if [[ ${PV} == *9999* ]]; then + git-r3_src_unpack + go-module_live_vendor + else + go-module_src_unpack + fi +} + +src_prepare() { + default + use test || sed -i -e 's|coredns: $(CHECKS)|coredns:|' Makefile +} + +src_compile() { + # For non-live versions, prevent git operations which causes sandbox violations + # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493 + [[ ${PV} != 9999* ]] && export GITCOMMIT='' + + # Mimicking go-module.eclass's GOFLAGS + if use amd64 || use arm || use arm64 || + ( use ppc64 && [[ $(tc-endian) == "little" ]] ) || use s390 || use x86; then + local buildmode="-buildmode=pie" + fi + export BUILDOPTS="-buildvcs=false -modcacherw -v -x -p=$(makeopts_jobs) ${buildmode}" + + default +} + +src_install() { + dobin "${PN}" + einstalldocs + doman man/* + + newinitd "${FILESDIR}"/coredns.initd coredns + newconfd "${FILESDIR}"/coredns.confd coredns + + insinto /etc/coredns/ + newins "${FILESDIR}"/Corefile.example Corefile + + insinto /etc/logrotate.d + newins "${FILESDIR}"/coredns.logrotated coredns + + systemd_dounit "${FILESDIR}"/coredns.service + newtmpfiles "${FILESDIR}"/coredns.tmpfiles "${PN}.conf" +} + +src_test() { + # eclass default '-x' makes tests output unreadable + export GOFLAGS="-v -mod=readonly" + + local known_fail=( + "TestZoneExternalCNAMELookupWithProxy" + "TestMetricsSeveralBlocs" + "TestMetricsAvailable" + "TestMetricsAvailableAfterReload" + "TestMetricsAvailableAfterReloadAndFailedReload" + ) + # concat as '|^Test1$|^Test2$|^Test3...$': + local known_fail_re="$(printf '|^%s$' "${known_fail[@]}")" + # drop '|' in the begining: + known_fail_re="${known_fail_re:1}" + + local working_tests_re="$( + # get list of all test: + { GOFLAGS="-mod=readonly" go test -list . ./... || + die "Can't get list of tests"; } | + # skip "no tests" messages as well as know failures: + grep -v -E " |${known_fail_re}" | + # format a regexp: + sed -z 's/\n/$|^/g' + )" + # drop '|^' in the end: + working_tests_re="^${working_tests_re::-2}" + + go test -race -run "${working_tests_re}" ./... || die "Tests failed" + go test -race -run "${known_fail_re}" ./... || ewarn "Known test failure" +} + +pkg_postinst() { + fcaps_pkg_postinst + tmpfiles_process ${PN}.conf +} diff --git a/net-dns/coredns/coredns-1.11.2.ebuild b/net-dns/coredns/coredns-1.11.2.ebuild new file mode 100644 index 000000000000..89d7e8f271e2 --- /dev/null +++ b/net-dns/coredns/coredns-1.11.2.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit fcaps go-module multiprocessing systemd tmpfiles toolchain-funcs + +DESCRIPTION="CoreDNS is a DNS server that chains plugins" +HOMEPAGE="https://github.com/coredns/coredns" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/coredns/coredns.git" +else + #SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + # The v1.11.2 tag went missing upstream, so use a previously fetched copy. + SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.gz" + SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz" + KEYWORDS="amd64" +fi + +# main +LICENSE="Apache-2.0" +# deps +LICENSE+=" MIT BSD ISC MPL-2.0 BSD-2" + +SLOT="0" +IUSE="test" +# TODO: debug test failure with deps tarball +RESTRICT="test" + +RDEPEND="acct-user/coredns + acct-group/coredns" + +FILECAPS=( + -m 755 'cap_net_bind_service=+ep' usr/bin/${PN} +) + +src_unpack() { + if [[ ${PV} == *9999* ]]; then + git-r3_src_unpack + go-module_live_vendor + else + go-module_src_unpack + fi +} + +src_prepare() { + default + use test || sed -i -e 's|coredns: $(CHECKS)|coredns:|' Makefile +} + +src_compile() { + # For non-live versions, prevent git operations which causes sandbox violations + # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493 + [[ ${PV} != 9999* ]] && export GITCOMMIT='' + + # Mimicking go-module.eclass's GOFLAGS + if use amd64 || use arm || use arm64 || + ( use ppc64 && [[ $(tc-endian) == "little" ]] ) || use s390 || use x86; then + local buildmode="-buildmode=pie" + fi + export BUILDOPTS="-buildvcs=false -modcacherw -v -x -p=$(makeopts_jobs) ${buildmode}" + + default +} + +src_install() { + dobin "${PN}" + einstalldocs + doman man/* + + newinitd "${FILESDIR}"/coredns.initd coredns + newconfd "${FILESDIR}"/coredns.confd coredns + + insinto /etc/coredns/ + newins "${FILESDIR}"/Corefile.example Corefile + + insinto /etc/logrotate.d + newins "${FILESDIR}"/coredns.logrotated coredns + + systemd_dounit "${FILESDIR}"/coredns.service + newtmpfiles "${FILESDIR}"/coredns.tmpfiles "${PN}.conf" +} + +src_test() { + # eclass default '-x' makes tests output unreadable + export GOFLAGS="-v -mod=readonly" + + local known_fail=( + "TestZoneExternalCNAMELookupWithProxy" + "TestMetricsSeveralBlocs" + "TestMetricsAvailable" + "TestMetricsAvailableAfterReload" + "TestMetricsAvailableAfterReloadAndFailedReload" + ) + # concat as '|^Test1$|^Test2$|^Test3...$': + local known_fail_re="$(printf '|^%s$' "${known_fail[@]}")" + # drop '|' in the begining: + known_fail_re="${known_fail_re:1}" + + local working_tests_re="$( + # get list of all test: + { GOFLAGS="-mod=readonly" go test -list . ./... || + die "Can't get list of tests"; } | + # skip "no tests" messages as well as know failures: + grep -v -E " |${known_fail_re}" | + # format a regexp: + sed -z 's/\n/$|^/g' + )" + # drop '|^' in the end: + working_tests_re="^${working_tests_re::-2}" + + go test -race -run "${working_tests_re}" ./... || die "Tests failed" + go test -race -run "${known_fail_re}" ./... || ewarn "Known test failure" +} + +pkg_postinst() { + fcaps_pkg_postinst + tmpfiles_process ${PN}.conf +} diff --git a/net-dns/coredns/coredns-1.8.3.ebuild b/net-dns/coredns/coredns-9999.ebuild index 33cabfaed3a2..52c5778f1173 100644 --- a/net-dns/coredns/coredns-1.8.3.ebuild +++ b/net-dns/coredns/coredns-9999.ebuild @@ -1,36 +1,66 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -# Don't forget to update when bumping. Used in --version output -EGIT_COMMIT="4293992bb83a5eac1d1e617a40638db6db046283" +inherit fcaps go-module multiprocessing systemd tmpfiles toolchain-funcs -inherit fcaps go-module systemd tmpfiles - -ARCHIVE_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI="${ARCHIVE_URI} https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz" +DESCRIPTION="CoreDNS is a DNS server that chains plugins" +HOMEPAGE="https://github.com/coredns/coredns" -KEYWORDS="~amd64" +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/coredns/coredns.git" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI+=" https://github.com/rahilarious/gentoo-distfiles/releases/download/${P}/deps.tar.xz -> ${P}-deps.tar.xz" + KEYWORDS="~amd64" +fi -DESCRIPTION="A DNS server that chains middleware" -HOMEPAGE="https://github.com/coredns/coredns" +# main +LICENSE="Apache-2.0" +# deps +LICENSE+=" MIT BSD ISC MPL-2.0 BSD-2" -LICENSE="Apache-2.0 MIT BSD ISC MPL-2.0 BSD-2" SLOT="0" +IUSE="test" +# TODO: debug test failure with deps tarball +RESTRICT="test" + RDEPEND="acct-user/coredns acct-group/coredns" -# TODO: debug test failure with deps tarball -RESTRICT+=" test" - FILECAPS=( -m 755 'cap_net_bind_service=+ep' usr/bin/${PN} ) +src_unpack() { + if [[ ${PV} == *9999* ]]; then + git-r3_src_unpack + go-module_live_vendor + else + go-module_src_unpack + fi +} + +src_prepare() { + default + use test || sed -i -e 's|coredns: $(CHECKS)|coredns:|' Makefile +} + src_compile() { - go build -v -ldflags="-X github.com/coredns/coredns/coremain.GitCommit=${EGIT_COMMIT}" || - die "go build failed" + # For non-live versions, prevent git operations which causes sandbox violations + # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493 + [[ ${PV} != 9999* ]] && export GITCOMMIT='' + + # Mimicking go-module.eclass's GOFLAGS + if use amd64 || use arm || use arm64 || + ( use ppc64 && [[ $(tc-endian) == "little" ]] ) || use s390 || use x86; then + local buildmode="-buildmode=pie" + fi + export BUILDOPTS="-buildvcs=false -modcacherw -v -x -p=$(makeopts_jobs) ${buildmode}" + + default } src_install() { diff --git a/net-dns/coredns/files/coredns.service b/net-dns/coredns/files/coredns.service index eab9aede713e..fc2ec10c5c43 100644 --- a/net-dns/coredns/files/coredns.service +++ b/net-dns/coredns/files/coredns.service @@ -1,7 +1,9 @@ [Unit] Description=CoreDNS DNS server +Documentation=man:coredns(1) Documentation=https://coredns.io -After=network.target +After=network-online.target +Wants=network-online.target [Service] PermissionsStartOnly=true diff --git a/net-dns/coredns/metadata.xml b/net-dns/coredns/metadata.xml index 970332552b10..924b78453af7 100644 --- a/net-dns/coredns/metadata.xml +++ b/net-dns/coredns/metadata.xml @@ -5,14 +5,24 @@ <email>zmedico@gentoo.org</email> <name>Zac Medico</name> </maintainer> + <maintainer type="person" proxied="yes"> + <email>me@rahil.rocks</email> + <name>Rahil Bhimjiani</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <longdescription> - CoreDNS is a DNS server/forwarder, written in Go, that chains plugins. - It is fast and flexible. The key word here is flexible: - with CoreDNS you are able to do what you want with your DNS data by utilizing plugins. - CoreDNS can listen for DNS requests coming in over UDP/TCP (go'old DNS), TLS (RFC 7858), - also called DoT, DNS over HTTP/2 - DoH - (RFC 8484) and gRPC (not a standard). + CoreDNS is a DNS server/forwarder, written in Go, that chains plugins. + It is fast and flexible. The key word here is flexible: + with CoreDNS you are able to do what you want with your DNS data by utilizing plugins. + CoreDNS can listen for DNS requests coming in over UDP/TCP (go'old DNS), TLS (RFC 7858), + also called DoT, DNS over HTTP/2 - DoH - (RFC 8484) and gRPC (not a standard). </longdescription> <upstream> <remote-id type="github">coredns/coredns</remote-id> + <bugs-to>https://github.com/coredns/coredns/issues</bugs-to> + <doc>https://coredns.io/manual/toc/</doc> </upstream> </pkgmetadata> diff --git a/net-dns/ddclient/Manifest b/net-dns/ddclient/Manifest index 5de0f53b774b..73efc46f6784 100644 --- a/net-dns/ddclient/Manifest +++ b/net-dns/ddclient/Manifest @@ -1 +1,2 @@ -DIST ddclient-3.9.1.tar.gz 63469 BLAKE2B 8ae6543353d96f76d926117ae53d74da6e8bc8f116fa15b8b0d39bc29a4c334bfc3d673b8f1c57139213b91414d1b9a2063fde9e1015f03fb76ba70a60956a7e SHA512 a8a4d6cb94e4239a7b7b4fc7d9ebef703cbd6c45fc3394b644694a053b5b8aa8d109410b5b8b3676a5f30b18474d24c7feb16c65c30b28bd7d941d8a214b1346 +DIST ddclient-3.11.1.tar.gz 277452 BLAKE2B f496443b972cfed0623eae3a4056b4315cc085e3358189f0846bedaeda53912ec43949da5c4505cc749bf0dea247702e5c2415f06b27dc6549739833a39c8365 SHA512 e823ce54f94e268d62c52e2e13f32e5549b0f91721c876e0bfde2f948ac60d6346fb633b96eda410174c9f039c9c67034efdec7826f249f85c5890e33b3279b0 +DIST ddclient-3.11.2.tar.gz 278314 BLAKE2B 5e60d8ab0889fbfe03cf182faf025b84faa6a5c278d0c0c1fd45c0bab88828bc3ebacdadac44d1cbd71202f1eff79a7ae0ffcb668992ad54f71e36f8c2f74333 SHA512 b0d275f5ccc36cd8b532b6176de885696ff189dbdffa71bc63e9fa6db2aaf4ab5ff3290c251e318f05b2163c546dcc785eb3582388d9fb70e8439e35e5cbcd7f diff --git a/net-dns/ddclient/ddclient-3.11.1.ebuild b/net-dns/ddclient/ddclient-3.11.1.ebuild new file mode 100644 index 000000000000..cb205a5469cd --- /dev/null +++ b/net-dns/ddclient/ddclient-3.11.1.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools optfeature systemd tmpfiles + +DESCRIPTION="Perl client used to update dynamic DNS entries" +HOMEPAGE="https://ddclient.net/" +SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86" +LICENSE="GPL-2+" +SLOT="0" +IUSE="examples selinux test" +RESTRICT="!test? ( test )" + +RDEPEND=" + acct-group/ddclient + acct-user/ddclient + dev-lang/perl + net-misc/curl + dev-perl/Digest-SHA1 + virtual/perl-Digest-SHA + virtual/perl-JSON-PP + selinux? ( sec-policy/selinux-ddclient ) +" + +BDEPEND=" + test? ( + dev-perl/HTTP-Daemon + dev-perl/HTTP-Daemon-SSL + dev-perl/Plack + dev-perl/Test-MockModule + dev-perl/Test-Warnings + ) +" + +src_prepare() { + default + + # Remove PID setting, to reliably setup the environment for the init script + sed -e '/^pid/d' -i ddclient.conf.in || die + + # Disable 'get_ip_from_if.pl' test, as it fails with network-sandbox + # Don't create cache directory, as it's created by init script / tmpfiles + sed -e '/get_ip_from_if.pl/d' -e '/MKDIR_P/d' -i Makefile.am || die + + # Remove windows executable + if use examples; then + rm sample-etc_dhcpc_dhcpcd-eth0.exe || die + fi + + eautoreconf +} + +src_install() { + default + + newinitd "${FILESDIR}"/ddclient.initd-r7 ddclient + systemd_newunit "${FILESDIR}"/ddclient.service-r2 ddclient.service + newtmpfiles "${FILESDIR}"/ddclient.tmpfiles-r1 ddclient.conf + + if use examples; then + docinto examples + dodoc sample-* + fi + + einstalldocs +} + +pkg_postinst() { + if [[ ${REPLACING_VERSIONS} ]]; then + for v in ${REPLACING_VERSIONS}; do + if ver_test "${v}" -lt 3.10.0; then + if [ -f "${EROOT}/etc/ddclient/ddclient.conf" ]; then + cp /etc/ddclient/ddclient.conf /etc/ddclient.conf || die + ewarn "Your DDClient configuration has been copied from" + ewarn "'/etc/ddclient/ddclient.conf' to '/etc/ddclient.conf'." + ewarn "Please check your configuration." + fi + break + fi + done + fi + + optfeature "using iproute2 instead if ifconfig." sys-apps/iproute2 + tmpfiles_process ddclient.conf +} diff --git a/net-dns/ddclient/ddclient-3.11.2.ebuild b/net-dns/ddclient/ddclient-3.11.2.ebuild new file mode 100644 index 000000000000..17f341073d57 --- /dev/null +++ b/net-dns/ddclient/ddclient-3.11.2.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools optfeature systemd tmpfiles + +DESCRIPTION="Perl client used to update dynamic DNS entries" +HOMEPAGE="https://ddclient.net/" +SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86" +LICENSE="GPL-2+" +SLOT="0" +IUSE="examples selinux test" +RESTRICT="!test? ( test )" + +RDEPEND=" + acct-group/ddclient + acct-user/ddclient + dev-lang/perl + net-misc/curl + dev-perl/Digest-SHA1 + virtual/perl-Digest-SHA + virtual/perl-JSON-PP + selinux? ( sec-policy/selinux-ddclient ) +" + +BDEPEND=" + test? ( + dev-perl/HTTP-Daemon + dev-perl/HTTP-Daemon-SSL + dev-perl/Plack + dev-perl/Test-MockModule + dev-perl/Test-Warnings + ) +" + +src_prepare() { + default + + # Remove PID setting, to reliably setup the environment for the init script + sed -e '/^pid/d' -i ddclient.conf.in || die + + # Disable 'get_ip_from_if.pl' test, as it fails with network-sandbox + # Don't create cache directory, as it's created by init script / tmpfiles + sed -e '/get_ip_from_if.pl/d' -e '/MKDIR_P/d' -i Makefile.am || die + + # Remove windows executable + if use examples; then + rm sample-etc_dhcpc_dhcpcd-eth0.exe || die + fi + + eautoreconf +} + +src_install() { + default + + newinitd "${FILESDIR}"/ddclient.initd-r7 ddclient + systemd_newunit "${FILESDIR}"/ddclient.service-r2 ddclient.service + newtmpfiles "${FILESDIR}"/ddclient.tmpfiles-r1 ddclient.conf + + if use examples; then + docinto examples + dodoc sample-* + fi + + einstalldocs +} + +pkg_postinst() { + if [[ ${REPLACING_VERSIONS} ]]; then + for v in ${REPLACING_VERSIONS}; do + if ver_test "${v}" -lt 3.10.0; then + if [ -f "${EROOT}/etc/ddclient/ddclient.conf" ]; then + cp /etc/ddclient/ddclient.conf /etc/ddclient.conf || die + ewarn "Your DDClient configuration has been copied from" + ewarn "'/etc/ddclient/ddclient.conf' to '/etc/ddclient.conf'." + ewarn "Please check your configuration." + fi + break + fi + done + fi + + optfeature "using iproute2 instead if ifconfig." sys-apps/iproute2 + tmpfiles_process ddclient.conf +} diff --git a/net-dns/ddclient/ddclient-3.9.1-r2.ebuild b/net-dns/ddclient/ddclient-3.9.1-r2.ebuild deleted file mode 100644 index b7461a66f5c5..000000000000 --- a/net-dns/ddclient/ddclient-3.9.1-r2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd tmpfiles - -DESCRIPTION="Perl client used to update dynamic DNS entries" -HOMEPAGE="https://ddclient.net/" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86" -LICENSE="GPL-2+" -SLOT="0" -IUSE="examples iproute2 selinux" - -RDEPEND=" - acct-group/ddclient - acct-user/ddclient - dev-lang/perl - dev-perl/Data-Validate-IP - dev-perl/Digest-SHA1 - dev-perl/IO-Socket-INET6 - dev-perl/IO-Socket-SSL - virtual/perl-Digest-SHA - virtual/perl-JSON-PP - iproute2? ( sys-apps/iproute2 ) - selinux? ( sec-policy/selinux-ddclient ) -" - -src_prepare() { - # Remove PID setting, to reliably setup the environment for the init script - sed -e '/^pid/d' -i sample-etc_ddclient.conf || die - - # Remove windows executable - if use examples; then - rm sample-etc_dhcpc_dhcpcd-eth0.exe || die - fi - - # Use sys-apps/iproute2 instead of sys-apps/net-tools - use iproute2 && eapply "${FILESDIR}"/${PN}-3.9.0-use_iproute2.patch - - default -} - -src_install() { - dobin ddclient - - insinto /etc/ddclient - insopts -m 0600 -o ddclient -g ddclient - newins sample-etc_ddclient.conf ddclient.conf - - newinitd "${FILESDIR}"/ddclient.initd-r6 ddclient - systemd_newunit "${FILESDIR}"/ddclient.service-r1 ddclient.service - newtmpfiles "${FILESDIR}"/ddclient.tmpfiles ddclient.conf - - dodoc Change* README* RELEASENOTE TODO UPGRADE - - if use examples; then - docinto examples - dodoc sample-* - fi -} - -pkg_postinst() { - tmpfiles_process ddclient.conf -} diff --git a/net-dns/ddclient/files/ddclient-3.9.0-use_iproute2.patch b/net-dns/ddclient/files/ddclient-3.9.0-use_iproute2.patch deleted file mode 100644 index b57f78ba14e1..000000000000 --- a/net-dns/ddclient/files/ddclient-3.9.0-use_iproute2.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/ddclient 2018-08-09 17:58:16.000000000 +0200 -+++ b/ddclient 2018-09-01 22:35:43.000000000 +0200 -@@ -710,7 +710,7 @@ - [ "ip", "=s", "-ip address : set the IP address to 'address'" ], - "", - [ "if", "=s", "-if interface : obtain IP address from 'interface'" ], -- [ "if-skip", "=s", "-if-skip pattern : skip any IP addresses before 'pattern' in the output of ifconfig {if}" ], -+ [ "if-skip", "=s", "-if-skip pattern : skip any IP addresses before 'pattern' in the output of ip addr show {if}" ], - "", - [ "web", "=s", "-web provider|url : obtain IP address from provider's IP checking page" ], - [ "web-skip", "=s", "-web-skip pattern : skip any IP addresses before 'pattern' on the web provider|url" ], -@@ -1448,7 +1448,7 @@ - - { - local $opt{'use'} = 'if'; -- foreach my $if (grep {/^[a-zA-Z]/} `ifconfig -a`) { -+ foreach my $if (grep {/^[a-zA-Z]/} `ip addr show`) { - $if =~ s/:?\s.*//is; - local $opt{'if'} = $if; - printf "use=if, if=%s address is %s\n", opt('if'), define(get_ip('if'), 'NOT FOUND'); -@@ -2165,7 +2165,7 @@ - - } elsif ($use eq 'if') { - $skip = opt('if-skip', $h) || ''; -- $reply = `ifconfig $arg 2> /dev/null`; -+ $reply = `ip addr show $arg 2> /dev/null`; - $reply = `ip addr list dev $arg 2> /dev/null` if $?; - $reply = '' if $?; - diff --git a/net-dns/ddclient/files/ddclient.initd-r6 b/net-dns/ddclient/files/ddclient.initd-r7 index 7bdc433d1ed1..62a6a9da6412 100644 --- a/net-dns/ddclient/files/ddclient.initd-r6 +++ b/net-dns/ddclient/files/ddclient.initd-r7 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 name="DDclient" @@ -16,7 +16,7 @@ depend() { } start_pre() { - checkpath -f -m 0600 -o ${command_user}:${command_group} /etc/ddclient/ddclient.conf + checkpath -f -m 0600 -o ${command_user}:${command_group} /etc/ddclient.conf checkpath -d -m 0700 -o ${command_user}:${command_group} /run/ddclient - checkpath -d -m 0700 -o ${command_user}:${command_group} /var/cache/ddclient + checkpath -d -m 0700 -o ${command_user}:${command_group} /var/lib/cache/ddclient } diff --git a/net-dns/ddclient/files/ddclient.service-r1 b/net-dns/ddclient/files/ddclient.service-r2 index d183b4f2a6c7..2ce4746a6ef2 100644 --- a/net-dns/ddclient/files/ddclient.service-r1 +++ b/net-dns/ddclient/files/ddclient.service-r2 @@ -1,6 +1,6 @@ [Unit] After=network-online.target -ConditionPathExists=/etc/ddclient/ddclient.conf +ConditionPathExists=/etc/ddclient.conf Description=DDclient [Service] diff --git a/net-dns/ddclient/files/ddclient.tmpfiles b/net-dns/ddclient/files/ddclient.tmpfiles deleted file mode 100644 index 4c6cc19ab943..000000000000 --- a/net-dns/ddclient/files/ddclient.tmpfiles +++ /dev/null @@ -1,3 +0,0 @@ -z /etc/ddclient/ddclient.conf 0600 ddclient ddclient - - -d /run/ddclient 0700 ddclient ddclient - - -d /var/cache/ddclient 0700 ddclient ddclient - - diff --git a/net-dns/ddclient/files/ddclient.tmpfiles-r1 b/net-dns/ddclient/files/ddclient.tmpfiles-r1 new file mode 100644 index 000000000000..eddef80e141e --- /dev/null +++ b/net-dns/ddclient/files/ddclient.tmpfiles-r1 @@ -0,0 +1,3 @@ +z /etc/ddclient.conf 0600 ddclient ddclient - - +d /run/ddclient 0700 ddclient ddclient - - +d /var/lib/cache/ddclient 0700 ddclient ddclient - - diff --git a/net-dns/ddclient/metadata.xml b/net-dns/ddclient/metadata.xml index 67bf4c73fbb9..211e2deb306b 100644 --- a/net-dns/ddclient/metadata.xml +++ b/net-dns/ddclient/metadata.xml @@ -17,10 +17,9 @@ </longdescription> <use> <flag name="examples">Install various example files, like for cron.</flag> - <flag name="iproute2">Use <pkg>sys-apps/iproute2</pkg> instead of <pkg>sys-apps/net-tools</pkg> for interaction.</flag> </use> <upstream> - <bugs-to>https://sourceforge.net/p/ddclient/bugs/</bugs-to> - <remote-id type="sourceforge">ddclient</remote-id> + <bugs-to>https://github.com/ddclient/ddclient/issues</bugs-to> + <remote-id type="github">ddclient/ddclient</remote-id> </upstream> </pkgmetadata> diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest index af9a9ef1e60a..64f722e2e2fe 100644 --- a/net-dns/djbdns/Manifest +++ b/net-dns/djbdns/Manifest @@ -1,3 +1,3 @@ DIST djbdns-1.05-man.tar.gz 17170 BLAKE2B 2fef7e1be8a427b2c426c2af58bf4c22795e64d03e0f605ca333e38f187ff65b333e88a7cea0e8a9ec867b446b5ca34a5c97dd24ae18b28ee4c747f2fd1f1608 SHA512 98af7bd9033a2205fbbc0f23b7eab45b9756f6ceff5199a62952e19c89c9fe3c03495cb6f8621d388f883c40650309a1509095417df3f54af21a71350c4aa183 -DIST djbdns-1.05-test28.diff.xz 22072 BLAKE2B fff6c13220adfa056a0ac5942ff9385d83b75f8622adaebab65f557a2ca8d014fe3c255fe55ba9afca56b24880b7cd28597b26b5bcc3bbbd3ef9f581b67004fd SHA512 7fbfeda10221a0a09897c2e744df5606c83113c394ce055d822b0d8733873d72567a88c37905d21c7d2395170fc12b9e9eb133a941aa809f1b9856872ab48230 +DIST djbdns-1.05-test32.diff.xz 31096 BLAKE2B 0bd6948ba3930f7d6e657f91ff76b1101fa7bb8f3da6849344c2230622fce6c15354e632a9140fefafee5986b522fb85c77c70ac64821d280043d1cd3564be2a SHA512 ed5ea46e3346841a8e8b6a77756c1dba53dab5636f73cf495bf1a182c393bef83d6035f6af26fb903baa75ee689db4abae222b6f85a7e245eb59f9c805163774 DIST djbdns-1.05.tar.gz 85648 BLAKE2B 51918fcc8944e64e72709636ee7d56975a138a2806e22c019fa836770de3a338bb8f682216b89c09d6b2861c2423e60e28dc60639f5a86aca2040e1788e4cf5c SHA512 20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9 diff --git a/net-dns/djbdns/djbdns-1.05-r35.ebuild b/net-dns/djbdns/djbdns-1.05-r38.ebuild index b9430c86fb90..d1df9ff618ef 100644 --- a/net-dns/djbdns/djbdns-1.05-r35.ebuild +++ b/net-dns/djbdns/djbdns-1.05-r38.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit flag-o-matic readme.gentoo-r1 toolchain-funcs +EAPI=8 +inherit readme.gentoo-r1 toolchain-funcs DESCRIPTION="Collection of DNS client/server software" -HOMEPAGE="http://cr.yp.to/djbdns.html" -IPV6_PATCH="test28" +HOMEPAGE="https://cr.yp.to/djbdns.html" +IPV6_PATCH="test32" SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz http://smarden.org/pape/djb/manpages/${P}-man.tar.gz @@ -36,7 +36,6 @@ src_unpack() { } PATCHES=( - "${FILESDIR}/headtail-r1.patch" "${FILESDIR}/dnsroots.patch" "${FILESDIR}/dnstracesort.patch" "${FILESDIR}/string_length_255.patch" @@ -45,6 +44,7 @@ PATCHES=( "${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch" "${FILESDIR}/CVE2012-1191_0001-ghost-domain-attack.patch" "${FILESDIR}/AR-and-RANLIB-support.patch" + "${FILESDIR}/tinydns-softlimit.patch" ) src_prepare() { @@ -53,9 +53,8 @@ src_prepare() { # The big ipv6 patch. "${WORKDIR}/${P}-${IPV6_PATCH}.diff" # Fix CVE2008-4392 (ipv6) - "${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test28.patch" - "${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch" - "${FILESDIR}/makefile-parallel-test25.patch" + "${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test32.patch" + "${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6-test29.patch" ) else PATCHES=(${PATCHES[@]} @@ -68,6 +67,14 @@ src_prepare() { fi default + + # Change "head -X" to the posix-compatible "head -nX" within the + # Makefile. We do this with sed instead of a patch because the ipv6 + # patch uses some of the surrounding lines; we'd need two versions + # of the patch. + sed -i Makefile \ + -e 's/head[[:space:]]\{1,\}\-\([0-9]\{1,\}\)/head -n\1/g' \ + || die 'failed to sed head in the Makefile' } src_compile() { diff --git a/net-dns/djbdns/djbdns-1.05-r39.ebuild b/net-dns/djbdns/djbdns-1.05-r39.ebuild new file mode 100644 index 000000000000..9b70fbb959bb --- /dev/null +++ b/net-dns/djbdns/djbdns-1.05-r39.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit flag-o-matic readme.gentoo-r1 toolchain-funcs + +DESCRIPTION="Collection of DNS client/server software" +HOMEPAGE="https://cr.yp.to/djbdns.html" +IPV6_PATCH="test32" + +SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz + http://smarden.org/pape/djb/manpages/${P}-man.tar.gz + ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.xz )" + +SLOT="0" +LICENSE="public-domain" +KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="ipv6 selinux" + +RDEPEND=" + acct-user/dnscache + acct-user/dnslog + acct-user/tinydns + sys-apps/ucspi-tcp + virtual/daemontools + selinux? ( sec-policy/selinux-djbdns )" + +src_unpack() { + # Unpack both djbdns and its man pages to separate directories. + default + + # Now move the man pages under ${S} so that user patches can be + # applied to them as well in src_prepare(). + mv "${PN}-man" "${P}/man" || die "failed to transplant man pages" +} + +PATCHES=( + "${FILESDIR}/dnsroots.patch" + "${FILESDIR}/dnstracesort.patch" + "${FILESDIR}/string_length_255.patch" + "${FILESDIR}/srv_record_support.patch" + "${FILESDIR}/increase-cname-recustion-depth.patch" + "${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch" + "${FILESDIR}/CVE2012-1191_0001-ghost-domain-attack.patch" + "${FILESDIR}/AR-and-RANLIB-support.patch" + "${FILESDIR}/tinydns-softlimit.patch" + "${FILESDIR}/${PN}-dnscache-configurable-truncate-manpages.patch" +) + +src_prepare() { + if use ipv6; then + PATCHES=(${PATCHES[@]} + # The big ipv6 patch. + "${WORKDIR}/${P}-${IPV6_PATCH}.diff" + # Fix CVE2008-4392 (ipv6) + "${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test32.patch" + "${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6-test29.patch" + "${FILESDIR}/${PN}-dnscache-configurable-truncate-size-v6.patch" + ) + else + PATCHES=(${PATCHES[@]} + "${FILESDIR}/implicit-declarations-nov6.patch" + # Fix CVE2008-4392 (no ipv6) + "${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-r1.patch" + "${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch" + # Later versions of the ipv6 patch include this + "${FILESDIR}/${PV}-errno-r1.patch" + "${FILESDIR}/${PN}-dnscache-configurable-truncate-size-nov6.patch" + ) + fi + + default + + # Change "head -X" to the posix-compatible "head -nX" within the + # Makefile. We do this with sed instead of a patch because the ipv6 + # patch uses some of the surrounding lines; we'd need two versions + # of the patch. + sed -i Makefile \ + -e 's/head[[:space:]]\{1,\}\-\([0-9]\{1,\}\)/head -n\1/g' \ + || die 'failed to sed head in the Makefile' +} + +src_compile() { + # Bug 927539. This is beyond our ability to realistically fix due + # to patch conflicts. + append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types) + + echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die + echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die + echo "/usr" > conf-home || die + emake AR=$(tc-getAR) RANLIB=$(tc-getRANLIB) +} + +src_install() { + insinto /etc + doins dnsroots.global + + into /usr + dobin *-conf dnscache tinydns walldns rbldns pickdns axfrdns \ + *-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx \ + dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort + + if use ipv6; then + dobin dnsip6 dnsip6q + fi + + dodoc CHANGES README + + doman man/*.[158] + + readme.gentoo_create_doc +} + +DISABLE_AUTOFORMATTING=1 +DOC_CONTENTS=' +To configure djbdns, please follow the instructions at, + + http://cr.yp.to/djbdns.html + +Of particular interest are, + + axfrdns : http://cr.yp.to/djbdns/axfrdns-conf.html + dnscache: http://cr.yp.to/djbdns/run-cache-x-home.html + tinydns : http://cr.yp.to/djbdns/run-server.html + +Portage has created users for axfrdns, dnscache, and tinydns; the +commands to configure these programs are, + + 1. axfrdns-conf tinydns dnslog /var/axfrdns /var/tinydns $ip + 2. dnscache-conf dnscache dnslog /var/dnscache $ip + 3. tinydns-conf tinydns dnslog /var/tinydns $ip + +(replace $ip with the ip address on which the server will run). + +If you wish to configure rbldns or walldns, you will need to create +those users yourself (although you should still use the "dnslog" +user for the logs): + + 4. rbldns-conf $username dnslog /var/rbldns $ip $base + 5. walldns-conf $username dnslog /var/walldns $ip +' diff --git a/net-dns/djbdns/files/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test28.patch b/net-dns/djbdns/files/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test32.patch index d493b8985e05..3dd47fbeb147 100644 --- a/net-dns/djbdns/files/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test28.patch +++ b/net-dns/djbdns/files/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test32.patch @@ -1,8 +1,8 @@ diff --git a/Makefile b/Makefile -index 5ccd647..eee09dd 100644 +index cee69a5..5afa9dc 100644 --- a/Makefile +++ b/Makefile -@@ -346,11 +346,11 @@ stralloc.h iopause.h taia.h tai.h uint64.h taia.h +@@ -351,11 +351,11 @@ iopause.h taia.h tai.h uint64.h ./compile dns_txt.c dnscache: \ @@ -16,16 +16,17 @@ index 5ccd647..eee09dd 100644 env.a alloc.a buffer.a libtai.a unix.a byte.a `cat \ socket.lib` -@@ -371,7 +371,7 @@ compile dnscache.c env.h exit.h scan.h strerr.h error.h ip4.h \ - uint16.h uint64.h socket.h uint16.h dns.h stralloc.h gen_alloc.h \ - iopause.h taia.h tai.h uint64.h taia.h taia.h byte.h roots.h fmt.h \ - iopause.h query.h dns.h uint32.h alloc.h response.h uint32.h cache.h \ --uint32.h uint64.h ndelay.h log.h uint64.h okclient.h droproot.h -+uint32.h uint64.h ndelay.h log.h uint64.h okclient.h droproot.h maxclient.h +@@ -374,7 +374,8 @@ dnscache.o: \ + compile dnscache.c env.h exit.h scan.h strerr.h error.h ip4.h ip6.h \ + uint16.h uint64.h socket.h uint32.h dns.h stralloc.h gen_alloc.h \ + iopause.h taia.h tai.h byte.h roots.h fmt.h query.h alloc.h \ +-response.h cache.h ndelay.h log.h okclient.h droproot.h openreadclose.h ++response.h cache.h ndelay.h log.h okclient.h droproot.h openreadclose.h \ ++maxclient.h ./compile dnscache.c dnsfilter: \ -@@ -749,11 +749,16 @@ qlog.o: \ +@@ -750,10 +751,15 @@ qlog.o: \ compile qlog.c buffer.h qlog.h uint16.h ./compile qlog.c @@ -36,26 +37,25 @@ index 5ccd647..eee09dd 100644 + query.o: \ compile query.c error.h roots.h log.h uint64.h case.h cache.h \ - uint32.h uint64.h byte.h dns.h stralloc.h gen_alloc.h iopause.h \ - taia.h tai.h uint64.h taia.h uint64.h uint32.h uint16.h dd.h alloc.h \ --response.h uint32.h query.h dns.h uint32.h -+response.h uint32.h query.h dns.h uint32.h qmerge.h + uint32.h byte.h dns.h stralloc.h gen_alloc.h iopause.h taia.h tai.h \ +-uint16.h dd.h alloc.h response.h query.h ip6.h ++uint16.h dd.h alloc.h response.h query.h ip6.h qmerge.h ./compile query.c random-ip: \ diff --git a/dnscache.c b/dnscache.c -index abcba69..c84e4b8 100644 +index d45f932..0c48ec1 100644 --- a/dnscache.c +++ b/dnscache.c -@@ -23,6 +23,7 @@ +@@ -24,6 +24,7 @@ #include "okclient.h" #include "droproot.h" #include "openreadclose.h" +#include "maxclient.h" - long interface; + unsigned long interface; -@@ -59,7 +60,6 @@ uint64 numqueries = 0; +@@ -60,7 +61,6 @@ uint64 numqueries = 0; static int udp53; @@ -63,7 +63,7 @@ index abcba69..c84e4b8 100644 static struct udpclient { struct query q; struct taia start; -@@ -136,7 +136,6 @@ void u_new(void) +@@ -137,7 +137,6 @@ void u_new(void) static int tcp53; @@ -72,10 +72,10 @@ index abcba69..c84e4b8 100644 struct query q; struct taia start; diff --git a/log.c b/log.c -index df465e2..1b0d98c 100644 +index e697f91..2ccc345 100644 --- a/log.c +++ b/log.c -@@ -149,6 +149,13 @@ void log_tx(const char *q,const char qtype[2],const char *control,const char ser +@@ -149,6 +149,13 @@ void log_tx(const char *q,const char qtype[2],const char *control,const unsigned line(); } @@ -90,17 +90,17 @@ index df465e2..1b0d98c 100644 { string("cached "); logtype(type); space(); diff --git a/log.h b/log.h -index fe62fa3..d9a829b 100644 +index 68d698f..c112785 100644 --- a/log.h +++ b/log.h @@ -18,6 +18,7 @@ extern void log_cachednxdomain(const char *); extern void log_cachedns(const char *,const char *); - extern void log_tx(const char *,const char *,const char *,const char *,unsigned int); + extern void log_tx(const char *q,const char qtype[2],const char *control,const unsigned char servers[256],unsigned int gluelessness); +extern void log_tx_piggyback(const char *,const char *,const char *); - extern void log_nxdomain(const char *,const char *,unsigned int); - extern void log_nodata(const char *,const char *,const char *,unsigned int); + extern void log_nxdomain(const unsigned char server[16],const char *q,unsigned int ttl); + extern void log_nodata(const unsigned char server[16],const char *q,const char qtype[2],unsigned int ttl); diff --git a/maxclient.h b/maxclient.h new file mode 100644 index 0000000..e52fcd1 @@ -266,7 +266,7 @@ index 0000000..9a58157 + +#endif /* QMERGE_H */ diff --git a/query.c b/query.c -index d61b20c..d9be8b8 100644 +index a340ffd..b85039c 100644 --- a/query.c +++ b/query.c @@ -84,7 +84,7 @@ static void cleanup(struct query *z) @@ -278,7 +278,7 @@ index d61b20c..d9be8b8 100644 for (j = 0;j < QUERY_MAXALIAS;++j) dns_domain_free(&z->alias[j]); for (j = 0;j < QUERY_MAXLEVEL;++j) { -@@ -624,15 +624,9 @@ static int doit(struct query *z,int state) +@@ -623,15 +623,9 @@ static int doit(struct query *z,int state) if (j == 256) goto SERVFAIL; dns_sortip6(z->servers[z->level],256); @@ -297,7 +297,7 @@ index d61b20c..d9be8b8 100644 return 0; -@@ -646,10 +640,10 @@ static int doit(struct query *z,int state) +@@ -645,10 +639,10 @@ static int doit(struct query *z,int state) HAVEPACKET: if (++z->loop == 200) goto DIE; @@ -311,7 +311,7 @@ index d61b20c..d9be8b8 100644 control = z->control[z->level]; d = z->name[z->level]; /* dtype = z->level ? DNS_T_A : z->type; */ -@@ -1071,7 +1065,7 @@ int query_start(struct query *z,char *dn,char type[2],char class[2],char localip +@@ -1075,7 +1069,7 @@ int query_start(struct query *z,char *dn,char type[2],char class[2],unsigned cha int query_get(struct query *z,iopause_fd *x,struct taia *stamp) { @@ -320,7 +320,7 @@ index d61b20c..d9be8b8 100644 case 1: return doit(z,1); case -1: -@@ -1082,5 +1076,5 @@ int query_get(struct query *z,iopause_fd *x,struct taia *stamp) +@@ -1086,5 +1080,5 @@ int query_get(struct query *z,iopause_fd *x,struct taia *stamp) void query_io(struct query *z,iopause_fd *x,struct taia *deadline) { @@ -328,7 +328,7 @@ index d61b20c..d9be8b8 100644 + qmerge_io(z->qm,x,deadline); } diff --git a/query.h b/query.h -index 61812aa..93a322e 100644 +index 84f33c7..0cd4ece 100644 --- a/query.h +++ b/query.h @@ -1,7 +1,7 @@ @@ -348,4 +348,4 @@ index 61812aa..93a322e 100644 + struct qmerge *qm; } ; - extern int query_start(struct query *,char *,char *,char *,char *,unsigned int); + extern int query_start(struct query *z,char *dn,char type[2],char class[2],unsigned char localip[16],unsigned int scope_id); diff --git a/net-dns/djbdns/files/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch b/net-dns/djbdns/files/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6-test29.patch index d5b9c10d64d3..9073658cb6e2 100644 --- a/net-dns/djbdns/files/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch +++ b/net-dns/djbdns/files/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6-test29.patch @@ -1,7 +1,8 @@ -diff -urNp a/query.c b/query.c ---- a/query.c 2009-03-19 11:35:28.452472164 -0700 -+++ b/query.c 2009-03-19 11:59:19.798221593 -0700 -@@ -476,6 +476,29 @@ static int doit(struct query *z,int stat +diff --git a/query.c b/query.c +index b85039c..df9622f 100644 +--- a/query.c ++++ b/query.c +@@ -475,6 +475,29 @@ static int doit(struct query *z,int state) } } @@ -31,7 +32,7 @@ diff -urNp a/query.c b/query.c if (typematch(DNS_T_A,dtype)) { byte_copy(key,2,DNS_T_A); cached = cache_get(key,dlen + 2,&cachedlen,&ttl); -@@ -541,7 +564,7 @@ static int doit(struct query *z,int stat +@@ -544,7 +567,7 @@ static int doit(struct query *z,int state) } } @@ -40,7 +41,7 @@ diff -urNp a/query.c b/query.c byte_copy(key,2,dtype); cached = cache_get(key,dlen + 2,&cachedlen,&ttl); if (cached && (cachedlen || byte_diff(dtype,2,DNS_T_ANY))) { -@@ -769,15 +792,24 @@ static int doit(struct query *z,int stat +@@ -779,15 +802,24 @@ static int doit(struct query *z,int state) else if (byte_equal(type,2,DNS_T_AXFR)) ; else if (byte_equal(type,2,DNS_T_SOA)) { @@ -53,7 +54,7 @@ diff -urNp a/query.c b/query.c pos = dns_packet_copy(buf,len,pos,misc,20); if (!pos) goto DIE; - if (records[i] < posauthority) + if (records[i] < posauthority) { - log_rrsoa(whichserver,t1,t2,t3,misc,ttl); + log_rrsoa(whichserver,t1,t2,t3,(const char*)misc,ttl); + save_data(misc,20); + save_data(t2,dns_domain_length(t2)); + save_data(t3,dns_domain_length(t3)); diff --git a/net-dns/djbdns/files/djbdns-dnscache-configurable-truncate-manpages.patch b/net-dns/djbdns/files/djbdns-dnscache-configurable-truncate-manpages.patch new file mode 100644 index 000000000000..0b022299ab1c --- /dev/null +++ b/net-dns/djbdns/files/djbdns-dnscache-configurable-truncate-manpages.patch @@ -0,0 +1,53 @@ +From 927121fa9afe047009a2502491d1c7000871b45c Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Wed, 25 Oct 2023 19:28:50 -0400 +Subject: [PATCH] dnscache.8,tinydns.8: document TRUNCATELEN hack for microtiks + +--- + dnscache.8 | 9 +++++++++ + tinydns.8 | 9 +++++++++ + 2 files changed, 18 insertions(+) + +diff --git a/dnscache.8 b/dnscache.8 +index 54fd357..38dab27 100644 +--- a/man/dnscache.8 ++++ b/man/dnscache.8 +@@ -116,6 +116,15 @@ for other caches, not root servers. + It forwards queries to those caches the same way that a client does, + rather than contacting a chain of servers according to NS records. + ++.B dnscache ++will use the value of ++.I $TRUNCATELEN ++as the cut-off for a UDP response. The standard value according to the ++RFC is 512 (bytes), but ++.I $TRUNCATELEN ++can be anywhere between 512 and 16384. This may be necessary to work ++around implementation bugs. ++ + .SH Memory use + + .B dnscache +diff --git a/tinydns.8 b/tinydns.8 +index ff92edd..bc991dd 100644 +--- a/man/tinydns.8 ++++ b/man/tinydns.8 +@@ -47,6 +47,15 @@ as specified by + a binary file created by + .BR tinydns-data (8). + ++.B tinydns ++will use the value of ++.I $TRUNCATELEN ++as the cut-off for a UDP response. The standard value according to the ++RFC is 512 (bytes), but ++.I $TRUNCATELEN ++can be anywhere between 512 and 16384. This may be necessary to work ++around implementation bugs. ++ + .SH Further details + + .B tinydns +-- +2.41.0 + diff --git a/net-dns/djbdns/files/djbdns-dnscache-configurable-truncate-size-nov6.patch b/net-dns/djbdns/files/djbdns-dnscache-configurable-truncate-size-nov6.patch new file mode 100644 index 000000000000..d855c212d198 --- /dev/null +++ b/net-dns/djbdns/files/djbdns-dnscache-configurable-truncate-size-nov6.patch @@ -0,0 +1,78 @@ +diff --git a/dnscache.c b/dnscache.c +index 8c899a3..8b10571 100644 +--- a/dnscache.c ++++ b/dnscache.c +@@ -51,6 +51,7 @@ static char myipincoming[4]; + static char buf[1024]; + uint64 numqueries = 0; + ++static unsigned int truncate_len = 512; + + static int udp53; + +@@ -77,7 +78,7 @@ void u_respond(int j) + { + if (!u[j].active) return; + response_id(u[j].id); +- if (response_len > 512) response_tc(); ++ if (response_len > truncate_len) response_tc(); + socket_send4(udp53,response,response_len,u[j].ip,u[j].port); + log_querydone(&u[j].active,response_len); + u[j].active = 0; --uactive; +@@ -431,6 +432,15 @@ int main() + if (!cache_init(cachesize)) + strerr_die3x(111,FATAL,"not enough memory for cache of size ",x); + ++ x = env_get("TRUNCATELEN"); ++ if (x) { ++ scan_ulong(x,&truncate_len); ++ if (truncate_len < 512) ++ truncate_len = 512; ++ if (truncate_len > 16384) ++ truncate_len = 16384; ++ } ++ + if (env_get("HIDETTL")) + response_hidettl(); + if (env_get("FORWARDONLY")) +diff --git a/server.c b/server.c +index e486fe1..63ad11c 100644 +--- a/server.c ++++ b/server.c +@@ -2,6 +2,7 @@ + #include "case.h" + #include "env.h" + #include "buffer.h" ++#include "scan.h" + #include "strerr.h" + #include "ip4.h" + #include "uint16.h" +@@ -83,6 +84,7 @@ int main() + { + char *x; + int udp53; ++ unsigned int truncate_len = 512; + + x = env_get("IP"); + if (!x) +@@ -105,11 +107,19 @@ int main() + + buffer_putsflush(buffer_2,starting); + ++ x = env_get("TRUNCATELEN"); ++ if (x) { ++ scan_ulong(x,&truncate_len); ++ if (truncate_len < 512) ++ truncate_len = 512; ++ if (truncate_len > 16384) ++ truncate_len = 16384; ++ } + for (;;) { + len = socket_recv4(udp53,buf,sizeof buf,ip,&port); + if (len < 0) continue; + if (!doit()) continue; +- if (response_len > 512) response_tc(); ++ if (response_len > truncate_len) response_tc(); + socket_send4(udp53,response,response_len,ip,port); + /* may block for buffer space; if it fails, too bad */ + } diff --git a/net-dns/djbdns/files/djbdns-dnscache-configurable-truncate-size-v6.patch b/net-dns/djbdns/files/djbdns-dnscache-configurable-truncate-size-v6.patch new file mode 100644 index 000000000000..cea01ebd30d1 --- /dev/null +++ b/net-dns/djbdns/files/djbdns-dnscache-configurable-truncate-size-v6.patch @@ -0,0 +1,95 @@ +From: Jaco Kroon <jaco@uls.co.za> +Date: Tue, 24 Oct 2023 06:36:10 +0200 +Subject: [PATCH] dnscache: Enable larger truncation + +This variation applies on top of the IPv6 patch. + +This is a workaround for https://forum.mikrotik.com/viewtopic.php?t=200627 +where Mikrotik doesn't fall back if the UDP response is truncated. + +This is done by enabling larger (configurable) than 512 byte responses on UDP +such that Mikrotik doesn't have a need to revert to TCP. Since it's impossible +to truly know the maximum size of a DNS response trivially this is made +configurable and the upper limit is arbitrarily capped to 16KB. + +Signed-off-by: Jaco Kroon <jaco@uls.co.za> +diff -bru djbdns-1.05.o/dnscache.c djbdns-1.05/dnscache.c +--- a/dnscache.c 2023-10-20 00:34:15.788688135 +0200 ++++ b/dnscache.c 2023-10-20 00:46:55.030355147 +0200 +@@ -58,6 +58,7 @@ + static char buf[1024]; + uint64 numqueries = 0; + ++static unsigned int truncate_len = 512; + + static int udp53; + +@@ -84,7 +85,7 @@ + { + if (!u[j].active) return; + response_id(u[j].id); +- if (response_len > 512) response_tc(); ++ if (response_len > truncate_len) response_tc(); + socket_send6(udp53,response,response_len,u[j].ip,u[j].port,u[j].scope_id); + log_querydone(&u[j].active,response_len); + u[j].active = 0; --uactive; +@@ -449,6 +450,15 @@ + if (!cache_init(cachesize)) + strerr_die3x(111,FATAL,"not enough memory for cache of size ",x); + ++ x = env_get("TRUNCATELEN"); ++ if (x) { ++ scan_ulong(x,&truncate_len); ++ if (truncate_len < 512) ++ truncate_len = 512; ++ if (truncate_len > 16384) ++ truncate_len = 16384; ++ } ++ + if (openreadclose("ignoreip",&sa,64) < 0) + strerr_die2x(111,FATAL,"trouble reading ignoreip"); + for(j = k = i = 0; i < sa.len; i++) +Only in djbdns-1.05/: .dnscache.c.swp +diff -bru djbdns-1.05.o/server.c djbdns-1.05/server.c +--- djbdns-1.05.o/server.c 2023-10-20 00:34:15.778688116 +0200 ++++ djbdns-1.05/server.c 2023-10-20 00:43:31.519954643 +0200 +@@ -2,6 +2,7 @@ + #include "case.h" + #include "env.h" + #include "buffer.h" ++#include "scan.h" + #include "strerr.h" + #include "ip4.h" + #include "uint16.h" +@@ -94,6 +94,7 @@ + int *udp53; + unsigned int off; + unsigned int cnt; ++ unsigned int truncate_len = 512; + iopause_fd *iop; + + x = env_get("IP"); +@@ -154,6 +155,14 @@ + + buffer_putsflush(buffer_2,starting); + ++ x = env_get("TRUNCATELEN"); ++ if (x) { ++ scan_ulong(x,&truncate_len); ++ if (truncate_len < 512) ++ truncate_len = 512; ++ if (truncate_len > 16384) ++ truncate_len = 16384; ++ } + for (;;) { + struct taia stamp; + struct taia deadline; +@@ -168,7 +177,7 @@ + len = socket_recv6(udp53[i],buf,sizeof buf,ip,&port,&ifid); + if (len < 0) continue; + if (!doit()) continue; +- if (response_len > 512) response_tc(); ++ if (response_len > truncate_len) response_tc(); + socket_send6(udp53[i],response,response_len,ip,port,ifid); + /* may block for buffer space; if it fails, too bad */ + } diff --git a/net-dns/djbdns/files/headtail-r1.patch b/net-dns/djbdns/files/headtail-r1.patch deleted file mode 100644 index 31854803ba89..000000000000 --- a/net-dns/djbdns/files/headtail-r1.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -Naur /tmp/djbdns-1.05/Makefile djbdns-1.05/Makefile ---- a/Makefile 2003-11-16 20:33:41.000000000 +0100 -+++ b/Makefile 2003-11-16 20:35:15.000000000 +0100 -@@ -31,7 +31,7 @@ - - auto_home.c: \ - auto-str conf-home -- ./auto-str auto_home `head -1 conf-home` > auto_home.c -+ ./auto-str auto_home `head -n 1 conf-home` > auto_home.c - - auto_home.o: \ - compile auto_home.c -@@ -205,14 +205,14 @@ - choose: \ - warn-auto.sh choose.sh conf-home - cat warn-auto.sh choose.sh \ -- | sed s}HOME}"`head -1 conf-home`"}g \ -+ | sed s}HOME}"`head -n 1 conf-home`"}g \ - > choose - chmod 755 choose - - compile: \ - warn-auto.sh conf-cc - ( cat warn-auto.sh; \ -- echo exec "`head -1 conf-cc`" '-c $${1+"$$@"}' \ -+ echo exec "`head -n 1 conf-cc`" '-c $${1+"$$@"}' \ - ) > compile - chmod 755 compile - -@@ -449,7 +449,7 @@ - dnstracesort: \ - warn-auto.sh dnstracesort.sh conf-home - cat warn-auto.sh dnstracesort.sh \ -- | sed s}HOME}"`head -1 conf-home`"}g \ -+ | sed s}HOME}"`head -n 1 conf-home`"}g \ - > dnstracesort - chmod 755 dnstracesort - -@@ -570,7 +570,7 @@ - warn-auto.sh conf-ld - ( cat warn-auto.sh; \ - echo 'main="$$1"; shift'; \ -- echo exec "`head -1 conf-ld`" \ -+ echo exec "`head -n 1 conf-ld`" \ - '-o "$$main" "$$main".o $${1+"$$@"}' \ - ) > load - chmod 755 load -@@ -758,7 +758,7 @@ - rts: \ - warn-auto.sh rts.sh conf-home - cat warn-auto.sh rts.sh \ -- | sed s}HOME}"`head -1 conf-home`"}g \ -+ | sed s}HOME}"`head -n 1 conf-home`"}g \ - > rts - chmod 755 rts - -@@ -901,8 +901,8 @@ - systype: \ - find-systype.sh conf-cc conf-ld trycpp.c x86cpuid.c - ( cat warn-auto.sh; \ -- echo CC=\'`head -1 conf-cc`\'; \ -- echo LD=\'`head -1 conf-ld`\'; \ -+ echo CC=\'`head -n 1 conf-cc`\'; \ -+ echo LD=\'`head -n 1 conf-ld`\'; \ - cat find-systype.sh; \ - ) | sh > systype - diff --git a/net-dns/djbdns/files/implicit-declarations-nov6.patch b/net-dns/djbdns/files/implicit-declarations-nov6.patch new file mode 100644 index 000000000000..8c749b2cec7a --- /dev/null +++ b/net-dns/djbdns/files/implicit-declarations-nov6.patch @@ -0,0 +1,79 @@ +Fix the build with -Werror=implicit-function-declarations + +diff --git a/chkshsgr.c b/chkshsgr.c +index 2b942d8..2d4e5f4 100644 +--- a/chkshsgr.c ++++ b/chkshsgr.c +@@ -1,3 +1,5 @@ ++#include <grp.h> ++#include <unistd.h> + #include "exit.h" + + int main() +diff --git a/dnsq.c b/dnsq.c +index 533e6af..fd9fe78 100644 +--- a/dnsq.c ++++ b/dnsq.c +@@ -1,3 +1,5 @@ ++#include <unistd.h> ++ + #include "uint16.h" + #include "strerr.h" + #include "buffer.h" +diff --git a/dnsqr.c b/dnsqr.c +index ff8ea6e..01bfe65 100644 +--- a/dnsqr.c ++++ b/dnsqr.c +@@ -1,3 +1,5 @@ ++#include <unistd.h> ++ + #include "uint16.h" + #include "strerr.h" + #include "buffer.h" +diff --git a/hier.c b/hier.c +index 4aef75b..c7c8766 100644 +--- a/hier.c ++++ b/hier.c +@@ -1,5 +1,11 @@ + #include "auto_home.h" + ++/* implemented in install.c and/or instcheck.c */ ++void c(char*, char*, char*, int, int, int); ++void h(char*, int, int, int); ++void d(char*, char*, int, int, int); ++ ++ + void hier() + { + c("/","etc","dnsroots.global",-1,-1,0644); +diff --git a/prot.c b/prot.c +index 0a8a373..1c56e9c 100644 +--- a/prot.c ++++ b/prot.c +@@ -1,3 +1,5 @@ ++#include <grp.h> ++#include <unistd.h> + #include "hasshsgr.h" + #include "prot.h" + +diff --git a/seek_set.c b/seek_set.c +index d08d4f3..47c61e4 100644 +--- a/seek_set.c ++++ b/seek_set.c +@@ -1,4 +1,5 @@ + #include <sys/types.h> ++#include <unistd.h> + #include "seek.h" + + #define SET 0 /* sigh */ +diff --git a/utime.c b/utime.c +index 4b7984f..be6c936 100644 +--- a/utime.c ++++ b/utime.c +@@ -1,5 +1,6 @@ + #include <sys/types.h> + #include <sys/time.h> ++#include <utime.h> + #include "scan.h" + #include "exit.h" + diff --git a/net-dns/djbdns/files/makefile-parallel-test25.patch b/net-dns/djbdns/files/makefile-parallel-test25.patch deleted file mode 100644 index 2754729acb97..000000000000 --- a/net-dns/djbdns/files/makefile-parallel-test25.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff --git a/Makefile b/Makefile -index 9ebf4c8..fe5ed73 100644 ---- a/Makefile -+++ b/Makefile -@@ -212,7 +212,7 @@ warn-auto.sh choose.sh conf-home - chmod 755 choose - - clientloc.o: \ --compile clientloc.c open.h byte.h cdb.h ip6.h -+compile clientloc.c open.h byte.h cdb.h uint32.h ip6.h - ./compile clientloc.c - - compile: \ -@@ -336,7 +336,7 @@ taia.h tai.h uint64.h taia.h - - dns_transmit.o: \ - compile dns_transmit.c socket.h uint16.h alloc.h error.h byte.h \ --uint16.h dns.h stralloc.h gen_alloc.h iopause.h taia.h tai.h uint64.h \ -+uint32.h dns.h stralloc.h gen_alloc.h iopause.h taia.h tai.h uint64.h \ - taia.h - ./compile dns_transmit.c - -@@ -859,15 +859,15 @@ trylsock.c compile load - rm -f trylsock.o trylsock - - socket_accept.o: \ --compile socket_accept.c byte.h socket.h uint16.h -+compile socket_accept.c byte.h socket.h uint16.h uint32.h - ./compile socket_accept.c - - socket_accept6.o: \ --compile socket_accept6.c byte.h socket.h uint16.h -+compile socket_accept6.c byte.h socket.h uint16.h uint32.h - ./compile socket_accept6.c - - socket_bind.o: \ --compile socket_bind.c byte.h socket.h uint16.h -+compile socket_bind.c byte.h socket.h uint16.h uint32.h - ./compile socket_bind.c - - socket_bind6.o: \ -@@ -875,7 +875,7 @@ compile socket_bind6.c sockaddr_in6.h haveip6.h byte.h socket.h uint16.h uint32. - ./compile socket_bind6.c - - socket_conn.o: \ --compile socket_conn.c byte.h socket.h uint16.h -+compile socket_conn.c byte.h socket.h uint16.h uint32.h - ./compile socket_conn.c - - socket_connect6.o: \ -@@ -883,11 +883,11 @@ compile socket_connect6.c byte.h socket.h uint16.h uint32.h - ./compile socket_connect6.c - - socket_listen.o: \ --compile socket_listen.c socket.h uint16.h -+compile socket_listen.c socket.h uint16.h uint32.h - ./compile socket_listen.c - - socket_recv.o: \ --compile socket_recv.c byte.h socket.h uint16.h -+compile socket_recv.c byte.h socket.h uint16.h uint32.h - ./compile socket_recv.c - - socket_recv6.o: \ -@@ -895,7 +895,7 @@ compile socket_recv6.c sockaddr_in6.h haveip6.h byte.h socket.h uint16.h uint32. - ./compile socket_recv6.c - - socket_send.o: \ --compile socket_send.c byte.h socket.h uint16.h -+compile socket_send.c byte.h socket.h uint16.h uint32.h - ./compile socket_send.c - - socket_send6.o: \ -@@ -903,7 +903,7 @@ compile socket_send6.c byte.h socket.h uint16.h uint32.h ip6.h haveip6.h error.h - ./compile socket_send6.c - - socket_tcp.o: \ --compile socket_tcp.c ndelay.h socket.h uint16.h -+compile socket_tcp.c ndelay.h socket.h uint16.h uint32.h - ./compile socket_tcp.c - - socket_tcp6.o: \ -@@ -911,7 +911,7 @@ compile socket_tcp6.c ndelay.h socket.h uint16.h uint32.h haveip6.h - ./compile socket_tcp6.c - - socket_udp.o: \ --compile socket_udp.c ndelay.h socket.h uint16.h -+compile socket_udp.c ndelay.h socket.h uint16.h uint32.h - ./compile socket_udp.c - - socket_udp6.o: \ diff --git a/net-dns/djbdns/files/tinydns-softlimit.patch b/net-dns/djbdns/files/tinydns-softlimit.patch new file mode 100644 index 000000000000..89d80d933012 --- /dev/null +++ b/net-dns/djbdns/files/tinydns-softlimit.patch @@ -0,0 +1,18 @@ +Use a larger memory limit by default than was chosen at the beginning +of time. This is evidently necessary on many machines, including my +own, starting somewhere around December 2020. + +https://bugs.gentoo.org/883159 + +diff -Naur a/tinydns-conf.c b/tinydns-conf.c +--- a/tinydns-conf.c 2001-02-11 21:11:45.000000000 +0000 ++++ b/tinydns-conf.c 2021-11-08 17:23:06.181385437 +0000 +@@ -46,7 +46,7 @@ + + start("run"); + outs("#!/bin/sh\nexec 2>&1\nexec envuidgid "); outs(user); +- outs(" envdir ./env softlimit -d300000 "); ++ outs(" envdir ./env softlimit -d4500000 "); + outs(auto_home); outs("/bin/tinydns\n"); + finish(); + perm(0755); diff --git a/net-dns/djbdns/metadata.xml b/net-dns/djbdns/metadata.xml index f5946e0f0cc5..6e76cd2b88bd 100644 --- a/net-dns/djbdns/metadata.xml +++ b/net-dns/djbdns/metadata.xml @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>mjo@gentoo.org</email> - <name>Michael Orlitzky</name> -</maintainer> + <use> + <!-- leave this global flag defined here to avoid a pkgcheck warning --> + <flag name="ipv6"> + Apply Fefe's patch (https://www.fefe.de/dns/) for ipv6 support. + </flag> + </use> </pkgmetadata> diff --git a/net-dns/dnrd/metadata.xml b/net-dns/dnrd/metadata.xml index 8a6342466ffe..4f0638f48b0a 100644 --- a/net-dns/dnrd/metadata.xml +++ b/net-dns/dnrd/metadata.xml @@ -3,8 +3,8 @@ <pkgmetadata> <!-- maintainer-needed --> <longdescription> -Domain Name Relay Daemon is a caching, forwarding DNS proxy server. Most useful on vpn or dialup firewalls but it is also a nice DNS cache for minor networks and workstations. -</longdescription> + Domain Name Relay Daemon is a caching, forwarding DNS proxy server. Most useful on vpn or dialup firewalls but it is also a nice DNS cache for minor networks and workstations. + </longdescription> <upstream> <remote-id type="sourceforge">dnrd</remote-id> </upstream> diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest index d719871447cd..537000cfa8d1 100644 --- a/net-dns/dnscrypt-proxy/Manifest +++ b/net-dns/dnscrypt-proxy/Manifest @@ -1 +1,2 @@ -DIST dnscrypt-proxy-2.1.1.tar.gz 6114345 BLAKE2B 9d68d94d1fc142d53ed74840080feca56d7abf606b8df9b2ebea7a69b75f13cdc93be53418e6101d30d31d6f4130b3794c1029a5972e129a4c06feeff7dd81e7 SHA512 1118d79aad8d3e3629616c203194a5346f00fcfe88783ebddc6f167d22a82006f26022e728c57905aa82997b87b77f0841f7c1b60e0f8e5335f9df142b759c21 +DIST dnscrypt-proxy-2.1.4.tar.gz 6897787 BLAKE2B 655011c98e335e0f605c093e5b12156afc9be88f0e14882e11cfdca1affa6de29830344e7c3aa7a5013f90a322f824d54e2db4d37a69395d344e90b0160e442b SHA512 4540d11432c4f35244b79f66b8926f8a1025e09010d8d313f0cd0d62e3fafcbd12bd24e9956ddf9cd8c1ec8aae997b031ab08dae4ee220bf31f33227ec6c07ca +DIST dnscrypt-proxy-2.1.5.tar.gz 4065395 BLAKE2B f8984121776565342c1920832839a9cebe8660eaa5f380baf5db6530a137efefbe270f61f9967426f3bea44110bf66b50524d2b891ec285eef1ad7329b1e305c SHA512 2c9a0e0896483b4453cb3779efd41205be8839e61e17b86701deb91e531676529a82b8859ae0975d121322ec8cc05bdd13a1324b8f56010692e1ac9f36a99d69 diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.1.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.4.ebuild index 2f8f698a764a..76ec52a2adbe 100644 --- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.1.ebuild +++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.4.ebuild @@ -1,28 +1,25 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 - -EGO_PN="github.com/DNSCrypt/${PN}" +EAPI=8 inherit fcaps go-module systemd +DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols" +HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy" + if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/DNSCrypt/dnscrypt-proxy.git" inherit git-r3 - EGIT_REPO_URI="https://${EGO_PN}.git" else - SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/DNSCrypt/dnscrypt-proxy/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 arm arm64 ppc64 x86" fi -DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols" -HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy" - LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0" SLOT="0" IUSE="+pie" -BDEPEND=">=dev-lang/go-1.13" RDEPEND=" acct-group/dnscrypt-proxy acct-user/dnscrypt-proxy @@ -31,7 +28,7 @@ RDEPEND=" FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy ) PATCHES=( - "${FILESDIR}/${PN}-2.1.0-config-full-paths.patch" + "${FILESDIR}"/${PN}-2.1.2-config-full-paths.patch ) src_compile() { @@ -96,7 +93,7 @@ pkg_postinst() { fi elog "After starting the service you will need to update your" - elog "/etc/resolv.conf and replace your current set of resolvers" + elog "${EROOT}/etc/resolv.conf and replace your current set of resolvers" elog "with:" elog elog "nameserver 127.0.0.1" diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.5.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.5.ebuild new file mode 100644 index 000000000000..84145490ad5e --- /dev/null +++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.5.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit fcaps go-module prefix systemd + +DESCRIPTION="Flexible DNS proxy, with support for encrypted DNS protocols" +HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/DNSCrypt/dnscrypt-proxy.git" + inherit git-r3 +else + SRC_URI="https://github.com/DNSCrypt/dnscrypt-proxy/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 arm arm64 ppc64 x86" +fi + +LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0" +SLOT="0" + +RDEPEND=" + acct-group/dnscrypt-proxy + acct-user/dnscrypt-proxy +" + +FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy ) + +PATCHES=( + "${FILESDIR}"/${PN}-2.1.5-config-full-paths.patch +) + +src_compile() { + pushd "${PN}" >/dev/null || die + ego build -v -x -mod=readonly -mod=vendor + popd >/dev/null || die +} + +src_test() { + cd "${PN}" || die + ego test -mod=vendor +} + +src_install() { + pushd "${PN}" >/dev/null || die + + dobin dnscrypt-proxy + + eprefixify example-dnscrypt-proxy.toml + insinto /etc/dnscrypt-proxy + newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml + doins example-{allowed,blocked}-{ips.txt,names.txt} + doins example-{cloaking-rules.txt,forwarding-rules.txt} + + popd >/dev/null || die + + insinto /usr/share/dnscrypt-proxy + doins -r "utils/generate-domains-blocklist/." + + newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy + newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy + + systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service + systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket + + insinto /etc/logrotate.d + newins "${FILESDIR}"/dnscrypt-proxy.logrotate dnscrypt-proxy + + einstalldocs +} + +pkg_postinst() { + fcaps_pkg_postinst + + if ! use filecaps; then + ewarn "'filecaps' USE flag is disabled" + ewarn "${PN} will fail to listen on port 53" + ewarn "please do one the following:" + ewarn "1) re-enable 'filecaps'" + ewarn "2) change port to > 1024" + ewarn "3) configure to run ${PN} as root (not recommended)" + ewarn + fi + + if systemd_is_booted || has_version sys-apps/systemd; then + elog "Using systemd socket activation may cause issues with speed" + elog "latency and reliability of ${PN} and is discouraged by upstream" + elog "Existing installations advised to disable 'dnscrypt-proxy.socket'" + elog "It is disabled by default for new installations" + elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details" + elog + + fi + + elog "After starting the service you will need to update your" + elog "${EROOT}/etc/resolv.conf and replace your current set of resolvers" + elog "with:" + elog + elog "nameserver 127.0.0.1" + elog + elog "Also see https://github.com/DNSCrypt/${PN}/wiki" +} diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild index 3e4c51ce549e..74779702e9ac 100644 --- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild +++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild @@ -1,28 +1,24 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -EGO_PN="github.com/DNSCrypt/${PN}" +inherit fcaps go-module prefix systemd -inherit fcaps go-module systemd +DESCRIPTION="Flexible DNS proxy, with support for encrypted DNS protocols" +HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy" if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/DNSCrypt/dnscrypt-proxy.git" inherit git-r3 - EGIT_REPO_URI="https://${EGO_PN}.git" else - SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/DNSCrypt/dnscrypt-proxy/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" fi -DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols" -HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy" - LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0" SLOT="0" -IUSE="+pie" -BDEPEND=">=dev-lang/go-1.13" RDEPEND=" acct-group/dnscrypt-proxy acct-user/dnscrypt-proxy @@ -31,18 +27,18 @@ RDEPEND=" FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy ) PATCHES=( - "${FILESDIR}/${PN}-2.1.0-config-full-paths.patch" + "${FILESDIR}"/${PN}-2.1.5-config-full-paths.patch ) src_compile() { pushd "${PN}" >/dev/null || die - go build -v -x -mod=readonly -mod=vendor -buildmode="$(usex pie pie default)" || die + ego build -v -x -mod=readonly -mod=vendor popd >/dev/null || die } src_test() { cd "${PN}" || die - go test -mod=vendor -buildmode="$(usex pie pie default)" || die "Failed to run tests" + ego test -mod=vendor } src_install() { @@ -50,6 +46,7 @@ src_install() { dobin dnscrypt-proxy + eprefixify example-dnscrypt-proxy.toml insinto /etc/dnscrypt-proxy newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml doins example-{allowed,blocked}-{ips.txt,names.txt} @@ -96,7 +93,7 @@ pkg_postinst() { fi elog "After starting the service you will need to update your" - elog "/etc/resolv.conf and replace your current set of resolvers" + elog "${EROOT}/etc/resolv.conf and replace your current set of resolvers" elog "with:" elog elog "nameserver 127.0.0.1" diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.0-config-full-paths.patch b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.2-config-full-paths.patch index b0ab738a57e5..c5d7ed53f5f5 100644 --- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.0-config-full-paths.patch +++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.2-config-full-paths.patch @@ -1,8 +1,6 @@ -diff --git a/dnscrypt-proxy/example-dnscrypt-proxy.toml b/dnscrypt-proxy/example-dnscrypt-proxy.toml -index e180a73..bc330dd 100644 --- a/dnscrypt-proxy/example-dnscrypt-proxy.toml +++ b/dnscrypt-proxy/example-dnscrypt-proxy.toml -@@ -341,7 +341,7 @@ reject_ttl = 10 +@@ -348,7 +348,7 @@ reject_ttl = 10 ## See the `example-forwarding-rules.txt` file for an example @@ -11,7 +9,7 @@ index e180a73..bc330dd 100644 -@@ -355,7 +355,7 @@ reject_ttl = 10 +@@ -364,7 +364,7 @@ reject_ttl = 10 ## ## See the `example-cloaking-rules.txt` file for an example @@ -20,7 +18,7 @@ index e180a73..bc330dd 100644 ## TTL used when serving entries in cloaking-rules.txt -@@ -408,7 +408,7 @@ cache_neg_max_ttl = 600 +@@ -418,7 +418,7 @@ cache_neg_max_ttl = 600 ## check for connectivity and captive portals, along with hard-coded ## IP addresses to return. @@ -29,7 +27,7 @@ index e180a73..bc330dd 100644 -@@ -438,8 +438,8 @@ cache_neg_max_ttl = 600 +@@ -448,8 +448,8 @@ cache_neg_max_ttl = 600 ## Certificate file and key - Note that the certificate has to be trusted. ## See the documentation (wiki) for more information. @@ -40,23 +38,41 @@ index e180a73..bc330dd 100644 -@@ -688,13 +688,13 @@ cache_neg_max_ttl = 600 +@@ -680,7 +680,7 @@ format = 'tsv' - # [sources.'odoh-servers'] - # urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/odoh-servers.md', 'https://download.dnscrypt.info/resolvers-list/v3/odoh-servers.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/odoh-servers.md', 'https://download.dnscrypt.net/resolvers-list/v3/odoh-servers.md'] + [sources.public-resolvers] + urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/public-resolvers.md'] +- cache_file = 'public-resolvers.md' ++ cache_file = '/var/cache/dnscrypt-proxy/public-resolvers.md' + minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' + refresh_delay = 72 + prefix = '' +@@ -689,7 +689,7 @@ format = 'tsv' + + [sources.relays] + urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/relays.md', 'https://download.dnscrypt.info/resolvers-list/v3/relays.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/relays.md'] +- cache_file = 'relays.md' ++ cache_file = '/var/cache/dnscrypt-proxy/relays.md' + minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' + refresh_delay = 72 + prefix = '' +@@ -698,13 +698,13 @@ format = 'tsv' + + # [sources.odoh-servers] + # urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/odoh-servers.md', 'https://download.dnscrypt.info/resolvers-list/v3/odoh-servers.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/odoh-servers.md'] - # cache_file = 'odoh-servers.md' + # cache_file = '/var/cache/dnscrypt-proxy/odoh-servers.md' # minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' # refresh_delay = 24 # prefix = '' - # [sources.'odoh-relays'] - # urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/odoh-relays.md', 'https://download.dnscrypt.info/resolvers-list/v3/odoh-relays.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/odoh-relays.md', 'https://download.dnscrypt.net/resolvers-list/v3/odoh-relays.md'] + # [sources.odoh-relays] + # urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/odoh-relays.md', 'https://download.dnscrypt.info/resolvers-list/v3/odoh-relays.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/odoh-relays.md'] - # cache_file = 'odoh-relays.md' + # cache_file = '/var/cache/dnscrypt-proxy/odoh-relays.md' # minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' # refresh_delay = 24 # prefix = '' -@@ -704,7 +704,7 @@ cache_neg_max_ttl = 600 +@@ -714,7 +714,7 @@ format = 'tsv' # [sources.quad9-resolvers] # urls = ['https://www.quad9.net/quad9-resolvers.md'] # minisign_key = 'RWQBphd2+f6eiAqBsvDZEBXBGHQBJfeG6G+wJPPKxCZMoEQYpmoysKUN' @@ -64,13 +80,13 @@ index e180a73..bc330dd 100644 + # cache_file = '/var/cache/dnscrypt-proxy/quad9-resolvers.md' # prefix = 'quad9-' - ## Another example source, with resolvers censoring some websites not appropriate for children -@@ -712,7 +712,7 @@ cache_neg_max_ttl = 600 + ### Another example source, with resolvers censoring some websites not appropriate for children +@@ -722,7 +722,7 @@ format = 'tsv' - # [sources.'parental-control'] - # urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/parental-control.md', 'https://download.dnscrypt.info/resolvers-list/v3/parental-control.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/parental-control.md', 'https://download.dnscrypt.net/resolvers-list/v3/parental-control.md'] -- # cache_file = 'parental-control.md' -+ # cache_file = '/var/cache/dnscrypt-proxy/parental-control.md' - # minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' + # [sources.parental-control] + # urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/parental-control.md', 'https://download.dnscrypt.info/resolvers-list/v3/parental-control.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/parental-control.md'] +- # cache_file = 'parental-control.md' ++ # cache_file = '/var/cache/dnscrypt-proxy/parental-control.md' + # minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.5-config-full-paths.patch b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.5-config-full-paths.patch new file mode 100644 index 000000000000..31c927484d90 --- /dev/null +++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.5-config-full-paths.patch @@ -0,0 +1,92 @@ +--- a/dnscrypt-proxy/example-dnscrypt-proxy.toml ++++ b/dnscrypt-proxy/example-dnscrypt-proxy.toml +@@ -372,7 +372,7 @@ reject_ttl = 10 + + ## See the `example-forwarding-rules.txt` file for an example + +-# forwarding_rules = 'forwarding-rules.txt' ++# forwarding_rules = '@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/forwarding-rules.txt' + + + +@@ -388,7 +388,7 @@ reject_ttl = 10 + ## + ## See the `example-cloaking-rules.txt` file for an example + +-# cloaking_rules = 'cloaking-rules.txt' ++# cloaking_rules = '@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/cloaking-rules.txt' + + ## TTL used when serving entries in cloaking-rules.txt + +@@ -442,7 +442,7 @@ cache_neg_max_ttl = 600 + ## check for connectivity and captive portals, along with hard-coded + ## IP addresses to return. + +-# map_file = 'example-captive-portals.txt' ++# map_file = '@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/example-captive-portals.txt' + + + +@@ -474,8 +474,8 @@ cache_neg_max_ttl = 600 + ## openssl req -x509 -nodes -newkey rsa:2048 -days 5000 -sha256 -keyout localhost.pem -out localhost.pem + ## See the documentation (wiki) for more information. + +-# cert_file = 'localhost.pem' +-# cert_key_file = 'localhost.pem' ++# cert_file = '@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/localhost.pem' ++# cert_key_file = '@GENTOO_PORTAGE_EPREFIX@/etc/dnscrypt-proxy/localhost.pem' + + + +@@ -706,7 +706,7 @@ format = 'tsv' + + [sources.public-resolvers] + urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md'] +- cache_file = 'public-resolvers.md' ++ cache_file = '@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/public-resolvers.md' + minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' + refresh_delay = 72 + prefix = '' +@@ -715,7 +715,7 @@ format = 'tsv' + + [sources.relays] + urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/relays.md', 'https://download.dnscrypt.info/resolvers-list/v3/relays.md'] +- cache_file = 'relays.md' ++ cache_file = '@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/relays.md' + minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' + refresh_delay = 72 + prefix = '' +@@ -724,13 +724,13 @@ format = 'tsv' + + # [sources.odoh-servers] + # urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/odoh-servers.md', 'https://download.dnscrypt.info/resolvers-list/v3/odoh-servers.md'] +- # cache_file = 'odoh-servers.md' ++ # cache_file = '@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/odoh-servers.md' + # minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' + # refresh_delay = 24 + # prefix = '' + # [sources.odoh-relays] + # urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/odoh-relays.md', 'https://download.dnscrypt.info/resolvers-list/v3/odoh-relays.md'] +- # cache_file = 'odoh-relays.md' ++ # cache_file = '@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/odoh-relays.md' + # minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' + # refresh_delay = 24 + # prefix = '' +@@ -740,7 +740,7 @@ format = 'tsv' + # [sources.quad9-resolvers] + # urls = ['https://www.quad9.net/quad9-resolvers.md'] + # minisign_key = 'RWQBphd2+f6eiAqBsvDZEBXBGHQBJfeG6G+wJPPKxCZMoEQYpmoysKUN' +- # cache_file = 'quad9-resolvers.md' ++ # cache_file = '@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/quad9-resolvers.md' + # prefix = 'quad9-' + + ### Another example source, with resolvers censoring some websites not appropriate for children +@@ -748,7 +748,7 @@ format = 'tsv' + + # [sources.parental-control] + # urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/parental-control.md', 'https://download.dnscrypt.info/resolvers-list/v3/parental-control.md'] +- # cache_file = 'parental-control.md' ++ # cache_file = '@GENTOO_PORTAGE_EPREFIX@/var/cache/dnscrypt-proxy/parental-control.md' + # minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' + + diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest index f53ad9476dcf..99501f134796 100644 --- a/net-dns/dnsdist/Manifest +++ b/net-dns/dnsdist/Manifest @@ -1,5 +1,4 @@ -DIST dnsdist-1.5.1.tar.bz2 1068061 BLAKE2B 1c0fdd181b62b96fcd433581715cea9dc204fcdd2f65efd26a5293cc9c17d904e0937b51ba33d2dc01ecc8044f491ba2c6c8720c0816587fa5082da73108783e SHA512 68fe5f55fd081ed80a620933af9f8310be0e21c86ba449a9c557975b5c83f4b64e3002e6032dc002582d081e70e1ec2ff080c5d8389fd46a9896bdafd5a41f9f -DIST dnsdist-1.6.0.tar.bz2 1328707 BLAKE2B d093142875882cacaa456d76d42e703e45577c32a0e5d5024fb372180d2bdd4ff0c82546142f6c2c01904bdd15407f0a39dc1d658e04e171cffe386cfc1e943d SHA512 f6a1676c431d5622af075bc184c9f82b4ea0bb40ec84797a8fe835804f91bc0a93a745495f193bb52f3a5204ec0e98ed41bc206c997d1f5b13e872bb31747b0f -DIST dnsdist-1.6.1.tar.bz2 1328069 BLAKE2B a9e9c0cb35ebc2ecd93d7fa0d6d3961b02d711da2df56240335786a5d2e529d4a7e8716f578b6e935edd3bc79dfed767d358b9feaff32dd9cd65993ef0b97b71 SHA512 68e114eeb1a7ae8a4ce52a7de31095c46d0ba8f572676a8ef1e858b97da199c04ec88656c7642160ba07b7db325cc2a49cd91794da8dd2e81a5301d089c34f90 -DIST dnsdist-1.7.0.tar.bz2 1392585 BLAKE2B 3766da5f63df6390f555307d665efcbb2ad1462abae3af44503479d4c6ae6453e43527d2bcac718fabeb8b60ec989f264860532b480c465afc440405f9efac74 SHA512 abaed7aaa18f4acaf220dc938da6896e521373b1da3b6b9c4114467dd5d8b0e6cd9809534edbc6ba5b789ed8387fb47317c47bd4e00e66a6ccb035f6dd6068af -DIST dnsdist-1.7.1.tar.bz2 1392179 BLAKE2B 48189da6bceb1723b19bab7c42ec8cd834f3ef6d822b5da23fe2f4e02ec825d1566bce472f522fa9ac0b027d36f3089ce7c0c7eb1c7e1161c050dc50305dfdb6 SHA512 eee44a9994c6cab84977cad58539ca59882149d6898dfeed9e4190f06ddbc280b836bf426d22e6980d8acae1437290bddcc5166af165b6eb48c77c669281a310 +DIST dnsdist-1.8.0.tar.bz2 1480500 BLAKE2B 47cfcfe3756cdc4520c1ba1e11b7d60191125ef900ba829ff7437ac2041352b845ab5f7183f53fea9b3aa6f44c5745de3878c2b72f2be048fa57d2c2e9325c0c SHA512 426db3e83729bd2f8a8c8b1c02d719c6618acc0aec09d1f2670c159d441c1cad2fdc85c5ffe919e76d1b1e8e24198bf29133802cb857dfacde2dfed2532001f1 +DIST dnsdist-1.8.1.tar.bz2 1492793 BLAKE2B 84fdf2f360c41ea235f3989d2bc14ad05e98d7b51dd20d983e7ad53ce5a6c00c7075b673e8a15fe3fd710a4e15c80db4d7431256bfb4291bd5785482d3f7f7e5 SHA512 db50c56587084ebdea3eb7f8e5b79178aea67b608cf6afce1453932b5225b3474a459cdc3dc8e4618a36a9edb405403dfefaed7fadd5848b5612de6bfb356f3a +DIST dnsdist-1.9.0.tar.bz2 1620891 BLAKE2B 9e14f275d83429ab3e83bdbbd6fe8d97b3212763398798d704adcc18d07ad8aebe16c5345425cdb589f6166155717d9649c16546bf981eb265e1349e74d11134 SHA512 32c0b9b3a1b58839da6dbde05eee382b78fbe58d68aed14f4927dc172dfcb15ba68b6d2246a8305b709e136e0e0c8666b6dd139ac258c8209083ff3b5673b997 +DIST dnsdist-1.9.3.tar.bz2 1577027 BLAKE2B 663b8a2161c5a7b94541cd775f135a99997024648c5bb57fd2ec18c7ede29aebda142452f97332300c45af32b5131e4dd5f9c1f904a1d68962398fa9a28c474e SHA512 26b4fa70c1ad70e21d86cc51389bffacbfecedd769e2bb39f376d1dc85491c9eddbd1aea1e4a9bd08d05fc58c2f1fc906d1ff19c8dfd653a779f4171242a546f diff --git a/net-dns/dnsdist/dnsdist-1.5.1-r100.ebuild b/net-dns/dnsdist/dnsdist-1.5.1-r100.ebuild deleted file mode 100644 index 4e2054c07ccb..000000000000 --- a/net-dns/dnsdist/dnsdist-1.5.1-r100.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..4} luajit ) - -inherit flag-o-matic lua-single - -DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer" -HOMEPAGE="https://dnsdist.org" - -SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2" -KEYWORDS="~amd64 ~x86" - -LICENSE="GPL-2" -SLOT="0" -IUSE="dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test" -RESTRICT="!test? ( test )" -REQUIRED_USE="${LUA_REQUIRED_USE} - dnscrypt? ( ssl ) - gnutls? ( ssl ) - doh? ( ssl !gnutls )" - -RDEPEND="acct-group/dnsdist - acct-user/dnsdist - >=dev-libs/boost-1.35:= - dev-libs/libedit:= - dnscrypt? ( dev-libs/libsodium:= ) - dnstap? ( dev-libs/fstrm:= ) - doh? ( www-servers/h2o:=[libh2o] ) - lmdb? ( dev-db/lmdb:= ) - regex? ( dev-libs/re2:= ) - remote-logging? ( >=dev-libs/protobuf-3:= ) - snmp? ( net-analyzer/net-snmp:= ) - ssl? ( - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( dev-libs/openssl:= ) - ) - systemd? ( sys-apps/systemd:0= ) - ${LUA_DEPS} -" - -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default -} - -src_configure() { - econf \ - --sysconfdir=/etc/dnsdist \ - --with-lua="${ELUA}" \ - $(use_enable doh dns-over-https) \ - $(use_enable dnscrypt) \ - $(use_enable dnstap) \ - $(use_with lmdb ) \ - $(use_with regex re2) \ - $(use_with remote-logging protobuf) \ - $(use_with snmp net-snmp) \ - $(use ssl && { echo "--enable-dns-over-tls" && use_with gnutls && use_with !gnutls libssl;} || echo "--without-gnutls --without-libssl") \ - $(use_enable systemd) \ - $(use_enable test unit-tests) - sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \ - -i "${S}/configure" -} - -src_install() { - default - - insinto /etc/dnsdist - doins "${FILESDIR}"/dnsdist.conf.example - - newconfd "${FILESDIR}"/dnsdist.confd ${PN} - newinitd "${FILESDIR}"/dnsdist.initd ${PN} -} - -pkg_postinst() { - elog "dnsdist provides multiple instances support. You can create more instances" - elog "by symlinking the dnsdist init script to another name." - elog - elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the" - elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default." -} diff --git a/net-dns/dnsdist/dnsdist-1.6.0.ebuild b/net-dns/dnsdist/dnsdist-1.6.0.ebuild deleted file mode 100644 index 84866fb8314e..000000000000 --- a/net-dns/dnsdist/dnsdist-1.6.0.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..4} luajit ) - -inherit flag-o-matic lua-single - -DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer" -HOMEPAGE="https://dnsdist.org" - -SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2" -KEYWORDS="~amd64" - -LICENSE="GPL-2" -SLOT="0" -IUSE="dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test" -RESTRICT="!test? ( test )" -REQUIRED_USE="${LUA_REQUIRED_USE} - dnscrypt? ( ssl ) - gnutls? ( ssl ) - doh? ( ssl !gnutls )" - -RDEPEND="acct-group/dnsdist - acct-user/dnsdist - >=dev-libs/boost-1.35:= - dev-libs/libedit:= - >=dev-libs/protobuf-3:= - dnscrypt? ( dev-libs/libsodium:= ) - dnstap? ( dev-libs/fstrm:= ) - doh? ( www-servers/h2o:=[libh2o] ) - lmdb? ( dev-db/lmdb:= ) - regex? ( dev-libs/re2:= ) - snmp? ( net-analyzer/net-snmp:= ) - ssl? ( - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( dev-libs/openssl:= ) - ) - systemd? ( sys-apps/systemd:0= ) - ${LUA_DEPS} -" - -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-1.6.0-gcc11-missing-include.patch -) - -src_configure() { - econf \ - --sysconfdir=/etc/dnsdist \ - --with-lua="${ELUA}" \ - $(use_enable doh dns-over-https) \ - $(use_enable dnscrypt) \ - $(use_enable dnstap) \ - $(use_with lmdb ) \ - $(use_with regex re2) \ - $(use_with snmp net-snmp) \ - $(use ssl && { echo "--enable-dns-over-tls" && use_with gnutls && use_with !gnutls libssl;} || echo "--without-gnutls --without-libssl") \ - $(use_enable systemd) \ - $(use_enable test unit-tests) - sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \ - -i "${S}/configure" -} - -src_install() { - default - - insinto /etc/dnsdist - doins "${FILESDIR}"/dnsdist.conf.example - - newconfd "${FILESDIR}"/dnsdist.confd ${PN} - newinitd "${FILESDIR}"/dnsdist.initd ${PN} -} - -pkg_postinst() { - elog "dnsdist provides multiple instances support. You can create more instances" - elog "by symlinking the dnsdist init script to another name." - elog - elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the" - elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default." -} diff --git a/net-dns/dnsdist/dnsdist-1.7.1.ebuild b/net-dns/dnsdist/dnsdist-1.7.1.ebuild deleted file mode 100644 index 0a7f9c72b105..000000000000 --- a/net-dns/dnsdist/dnsdist-1.7.1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..4} luajit ) - -inherit lua-single - -DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer" -HOMEPAGE="https://dnsdist.org" - -SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2" -KEYWORDS="~amd64" - -LICENSE="GPL-2" -SLOT="0" -IUSE="dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test" -RESTRICT="!test? ( test )" -REQUIRED_USE="${LUA_REQUIRED_USE} - dnscrypt? ( ssl ) - gnutls? ( ssl ) - doh? ( ssl !gnutls )" - -RDEPEND="acct-group/dnsdist - acct-user/dnsdist - >=dev-libs/boost-1.35:= - dev-libs/libedit:= - >=dev-libs/protobuf-3:= - dnscrypt? ( dev-libs/libsodium:= ) - dnstap? ( dev-libs/fstrm:= ) - doh? ( www-servers/h2o:=[libh2o] ) - lmdb? ( dev-db/lmdb:= ) - regex? ( dev-libs/re2:= ) - snmp? ( net-analyzer/net-snmp:= ) - ssl? ( - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( dev-libs/openssl:= ) - ) - systemd? ( sys-apps/systemd:0= ) - ${LUA_DEPS} - net-libs/nghttp2 -" - -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_configure() { - econf \ - --sysconfdir=/etc/dnsdist \ - --with-lua="${ELUA}" \ - $(use_enable doh dns-over-https) \ - $(use_enable dnscrypt) \ - $(use_enable dnstap) \ - $(use_with lmdb ) \ - $(use_with regex re2) \ - $(use_with snmp net-snmp) \ - $(use ssl && { echo "--enable-dns-over-tls" && use_with gnutls && use_with !gnutls libssl;} || echo "--without-gnutls --without-libssl") \ - $(use_enable systemd) \ - $(use_enable test unit-tests) - sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \ - -i "${S}/configure" -} - -src_install() { - default - - insinto /etc/dnsdist - doins "${FILESDIR}"/dnsdist.conf.example - - newconfd "${FILESDIR}"/dnsdist.confd ${PN} - newinitd "${FILESDIR}"/dnsdist.initd ${PN} -} - -pkg_postinst() { - elog "dnsdist provides multiple instances support. You can create more instances" - elog "by symlinking the dnsdist init script to another name." - elog - elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the" - elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default." -} diff --git a/net-dns/dnsdist/dnsdist-1.7.0.ebuild b/net-dns/dnsdist/dnsdist-1.8.0.ebuild index 2500a331c58d..c0ec5088ac0e 100644 --- a/net-dns/dnsdist/dnsdist-1.7.0.ebuild +++ b/net-dns/dnsdist/dnsdist-1.8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer" HOMEPAGE="https://dnsdist.org" SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~x86" LICENSE="GPL-2" SLOT="0" @@ -24,10 +24,10 @@ REQUIRED_USE="${LUA_REQUIRED_USE} RDEPEND="acct-group/dnsdist acct-user/dnsdist - >=dev-libs/boost-1.35:= + dev-libs/boost:= dev-libs/libedit:= + dev-libs/libsodium:= >=dev-libs/protobuf-3:= - dnscrypt? ( dev-libs/libsodium:= ) dnstap? ( dev-libs/fstrm:= ) doh? ( www-servers/h2o:=[libh2o] ) lmdb? ( dev-db/lmdb:= ) @@ -46,6 +46,9 @@ DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" src_configure() { + # bug #822855 + append-lfs-flags + econf \ --sysconfdir=/etc/dnsdist \ --with-lua="${ELUA}" \ diff --git a/net-dns/dnsdist/dnsdist-1.6.1.ebuild b/net-dns/dnsdist/dnsdist-1.8.1.ebuild index a883f49ab1c1..c0ec5088ac0e 100644 --- a/net-dns/dnsdist/dnsdist-1.6.1.ebuild +++ b/net-dns/dnsdist/dnsdist-1.8.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer" HOMEPAGE="https://dnsdist.org" SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~x86" LICENSE="GPL-2" SLOT="0" @@ -24,10 +24,10 @@ REQUIRED_USE="${LUA_REQUIRED_USE} RDEPEND="acct-group/dnsdist acct-user/dnsdist - >=dev-libs/boost-1.35:= + dev-libs/boost:= dev-libs/libedit:= + dev-libs/libsodium:= >=dev-libs/protobuf-3:= - dnscrypt? ( dev-libs/libsodium:= ) dnstap? ( dev-libs/fstrm:= ) doh? ( www-servers/h2o:=[libh2o] ) lmdb? ( dev-db/lmdb:= ) @@ -39,12 +39,16 @@ RDEPEND="acct-group/dnsdist ) systemd? ( sys-apps/systemd:0= ) ${LUA_DEPS} + net-libs/nghttp2 " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" src_configure() { + # bug #822855 + append-lfs-flags + econf \ --sysconfdir=/etc/dnsdist \ --with-lua="${ELUA}" \ diff --git a/net-dns/dnsdist/dnsdist-1.9.0-r1.ebuild b/net-dns/dnsdist/dnsdist-1.9.0-r1.ebuild new file mode 100644 index 000000000000..473717e4807a --- /dev/null +++ b/net-dns/dnsdist/dnsdist-1.9.0-r1.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit flag-o-matic lua-single + +DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer" +HOMEPAGE="https://dnsdist.org" + +SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2" +KEYWORDS="~amd64 ~x86" + +LICENSE="GPL-2" +SLOT="0" +IUSE="bpf cdb dnscrypt dnstap doh doh3 ipcipher lmdb quic regex snmp +ssl systemd test web xdp" +RESTRICT="!test? ( test )" +REQUIRED_USE="${LUA_REQUIRED_USE} + dnscrypt? ( ssl ) + doh? ( ssl ) + doh3? ( ssl quic ) + ipcipher? ( ssl ) + quic? ( ssl )" + +RDEPEND="acct-group/dnsdist + acct-user/dnsdist + bpf? ( dev-libs/libbpf:= ) + cdb? ( dev-db/tinycdb:= ) + dev-libs/boost:= + sys-libs/libcap + dev-libs/libedit + dev-libs/libsodium:= + dnstap? ( dev-libs/fstrm ) + doh? ( net-libs/nghttp2:= ) + doh3? ( net-libs/quiche:= ) + lmdb? ( dev-db/lmdb:= ) + quic? ( net-libs/quiche ) + regex? ( dev-libs/re2:= ) + snmp? ( net-analyzer/net-snmp:= ) + ssl? ( dev-libs/openssl:= ) + systemd? ( sys-apps/systemd:0= ) + xdp? ( net-libs/xdp-tools ) + ${LUA_DEPS} +" + +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + + # clean up duplicate file + rm -f README.md +} + +src_configure() { + # bug #822855 + append-lfs-flags + + # some things can only be enabled/disabled by defines + ! use dnstap && append-cppflags -DDISABLE_PROTOBUF + ! use web && append-cppflags -DDISABLE_BUILTIN_HTML + + sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \ + -i "${S}/configure" + + local myeconfargs=( + --sysconfdir=/etc/dnsdist + --with-lua="${ELUA}" + --without-h2o + --enable-tls-providers + --without-gnutls + $(use_with bpf ebpf) + $(use_with cdb cdb) + $(use_enable doh dns-over-https) + $(use_enable doh3 dns-over-http3) + $(use_enable dnscrypt) + $(use_enable dnstap) + $(use_enable ipcipher) + $(use_with lmdb ) + $(use_enable quic dns-over-quic) + $(use_with regex re2) + $(use_with snmp net-snmp) + $(use_enable ssl dns-over-tls) + $(use_enable systemd) \ + $(use_enable test unit-tests) + $(use_with xdp xsk) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + insinto /etc/dnsdist + doins "${FILESDIR}"/dnsdist.conf.example + + newconfd "${FILESDIR}"/dnsdist.confd ${PN} + newinitd "${FILESDIR}"/dnsdist.initd ${PN} +} + +pkg_postinst() { + elog "dnsdist provides multiple instances support. You can create more instances" + elog "by symlinking the dnsdist init script to another name." + elog + elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the" + elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default." +} diff --git a/net-dns/dnsdist/dnsdist-1.9.3.ebuild b/net-dns/dnsdist/dnsdist-1.9.3.ebuild new file mode 100644 index 000000000000..473717e4807a --- /dev/null +++ b/net-dns/dnsdist/dnsdist-1.9.3.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) + +inherit flag-o-matic lua-single + +DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer" +HOMEPAGE="https://dnsdist.org" + +SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2" +KEYWORDS="~amd64 ~x86" + +LICENSE="GPL-2" +SLOT="0" +IUSE="bpf cdb dnscrypt dnstap doh doh3 ipcipher lmdb quic regex snmp +ssl systemd test web xdp" +RESTRICT="!test? ( test )" +REQUIRED_USE="${LUA_REQUIRED_USE} + dnscrypt? ( ssl ) + doh? ( ssl ) + doh3? ( ssl quic ) + ipcipher? ( ssl ) + quic? ( ssl )" + +RDEPEND="acct-group/dnsdist + acct-user/dnsdist + bpf? ( dev-libs/libbpf:= ) + cdb? ( dev-db/tinycdb:= ) + dev-libs/boost:= + sys-libs/libcap + dev-libs/libedit + dev-libs/libsodium:= + dnstap? ( dev-libs/fstrm ) + doh? ( net-libs/nghttp2:= ) + doh3? ( net-libs/quiche:= ) + lmdb? ( dev-db/lmdb:= ) + quic? ( net-libs/quiche ) + regex? ( dev-libs/re2:= ) + snmp? ( net-analyzer/net-snmp:= ) + ssl? ( dev-libs/openssl:= ) + systemd? ( sys-apps/systemd:0= ) + xdp? ( net-libs/xdp-tools ) + ${LUA_DEPS} +" + +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + + # clean up duplicate file + rm -f README.md +} + +src_configure() { + # bug #822855 + append-lfs-flags + + # some things can only be enabled/disabled by defines + ! use dnstap && append-cppflags -DDISABLE_PROTOBUF + ! use web && append-cppflags -DDISABLE_BUILTIN_HTML + + sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \ + -i "${S}/configure" + + local myeconfargs=( + --sysconfdir=/etc/dnsdist + --with-lua="${ELUA}" + --without-h2o + --enable-tls-providers + --without-gnutls + $(use_with bpf ebpf) + $(use_with cdb cdb) + $(use_enable doh dns-over-https) + $(use_enable doh3 dns-over-http3) + $(use_enable dnscrypt) + $(use_enable dnstap) + $(use_enable ipcipher) + $(use_with lmdb ) + $(use_enable quic dns-over-quic) + $(use_with regex re2) + $(use_with snmp net-snmp) + $(use_enable ssl dns-over-tls) + $(use_enable systemd) \ + $(use_enable test unit-tests) + $(use_with xdp xsk) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + insinto /etc/dnsdist + doins "${FILESDIR}"/dnsdist.conf.example + + newconfd "${FILESDIR}"/dnsdist.confd ${PN} + newinitd "${FILESDIR}"/dnsdist.initd ${PN} +} + +pkg_postinst() { + elog "dnsdist provides multiple instances support. You can create more instances" + elog "by symlinking the dnsdist init script to another name." + elog + elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the" + elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default." +} diff --git a/net-dns/dnsdist/files/dnsdist-1.6.0-gcc11-missing-include.patch b/net-dns/dnsdist/files/dnsdist-1.6.0-gcc11-missing-include.patch deleted file mode 100644 index 6e549b2450ee..000000000000 --- a/net-dns/dnsdist/files/dnsdist-1.6.0-gcc11-missing-include.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://bugs.gentoo.org/790719 -https://github.com/hhoffstaette/portage/blob/master/net-dns/dnsdist/files/dnsdist-1.6.0-add-missing-include.patch - -From: Kees Monshouwer <mind04@monshouwer.org> -Date: Tue, 11 May 2021 10:27:01 +0200 -Subject: [PATCH] add missing includes (Fedora 34, gcc 11.1 / clang 12) - -[HH: reduced to necessary patch for dnsdist] ---- - lock.hh | 1 + - 1 file changed, 1 insertions(+) - -diff --git a/lock.hh b/lock.hh -index 09299d7979d..0644502f871 100644 ---- a/lock.hh -+++ b/lock.hh -@@ -20,6 +20,7 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - #pragma once -+#include <mutex> - #include <shared_mutex> - - class ReadWriteLock diff --git a/net-dns/dnsdist/metadata.xml b/net-dns/dnsdist/metadata.xml index 82ea726b8593..c0cba7b1344e 100644 --- a/net-dns/dnsdist/metadata.xml +++ b/net-dns/dnsdist/metadata.xml @@ -5,16 +5,33 @@ <email>nativemad@gentoo.org</email> <name>Andreas Schuerch</name> </maintainer> + <maintainer type="person" proxied="yes"> + <email>holger@applied-asynchrony.com</email> + <name>Holger Hoffstätte</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <longdescription lang="en"> dnsdist is a highly DNS-, DoS- and abuse-aware loadbalancer. Its goal in life is to route traffic to the best server, delivering top performance to legitimate users while shunting or blocking abusive traffic. </longdescription> <use> + <flag name="bpf">Enable support for eBPF socket filtering</flag> <flag name="dnscrypt">Enable the ability to act as a DNSCrypt server</flag> + <flag name="dnstap">Enable support for dnstap</flag> + <flag name="doh">Enable support for dns over http via <pkg>net-libs/nghttp2</pkg></flag> + <flag name="doh3">Enable support for dns over http3 via <pkg>net-libs/quiche</pkg></flag> + <flag name="ipcipher">Enable support for ipcipher via <pkg>dev-libs/openssl</pkg></flag> + <flag name="lmdb">Enable support for lmdb</flag> + <flag name="quic">Enable support for dns over quic via <pkg>net-libs/quiche</pkg></flag> <flag name="regex">Enable support for regular expression matching via <pkg>dev-libs/re2</pkg></flag> <flag name="remote-logging">Enable support for remote logging via <pkg>dev-libs/protobuf</pkg></flag> <flag name="ssl">Enable support for and encrypted client-server communication via <pkg>dev-libs/libsodium</pkg></flag> - <flag name="doh">Enable support for dns over http via <pkg>www-servers/h2o</pkg></flag> - <flag name="dnstap">Enable support for dnstap</flag> - <flag name="lmdb">Enable support for lmdb</flag> + <flag name="web">Enable support for the web UI</flag> + <flag name="xdp">Enable support for AF_XDP high performance packet processing</flag> </use> + <upstream> + <remote-id type="github">PowerDNS/pdns</remote-id> + </upstream> </pkgmetadata> diff --git a/net-dns/dnshijacker/Manifest b/net-dns/dnshijacker/Manifest deleted file mode 100644 index 6b6ea2370404..000000000000 --- a/net-dns/dnshijacker/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST dnshijacker-1.3.tar.gz 23569 BLAKE2B cd7631f94b5048ab6bbf8afe8fa27f0c2eb0b4295e7d4cbcf43907f32155a0c32a9ac589a75e9ddadc00f4a879239e16ef90289caaacd3f2a7a41e94366685a9 SHA512 628d545f1b6345e641254519cbb696ae2a38e218a5129558dae404d0ef374afdabf06c63775d5bc5d2d020de3bf339342c7e1a1b10beed4beadb703ff63c693d diff --git a/net-dns/dnshijacker/dnshijacker-1.3-r2.ebuild b/net-dns/dnshijacker/dnshijacker-1.3-r2.ebuild deleted file mode 100644 index 9d14969ff47d..000000000000 --- a/net-dns/dnshijacker/dnshijacker-1.3-r2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="a libnet/libpcap based packet sniffer and spoofer" -HOMEPAGE="http://pedram.redhive.com/code/dns_hijacker/" -SRC_URI="http://pedram.redhive.com/downloads/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 x86" - -DEPEND=" - >=net-libs/libnet-1.0.2a-r3:1.0 - net-libs/libpcap -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - -src_configure() { - tc-export CC -} - -src_install() { - dosbin dnshijacker ask_dns answer_dns - - insinto /etc/dnshijacker - doins ftable - - einstalldocs -} diff --git a/net-dns/dnshijacker/files/dnshijacker-1.3-gentoo.patch b/net-dns/dnshijacker/files/dnshijacker-1.3-gentoo.patch deleted file mode 100644 index 9af952067618..000000000000 --- a/net-dns/dnshijacker/files/dnshijacker-1.3-gentoo.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/answer_dns.c 2002-10-28 02:58:37.000000000 +0100 -+++ b/answer_dns.c 2010-09-19 01:16:28.000000000 +0200 -@@ -5 +5 @@ --#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/ask_dns.c 2002-10-28 02:58:34.000000000 +0100 -+++ b/ask_dns.c 2010-09-19 01:16:28.000000000 +0200 -@@ -5 +5 @@ --#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/dnshijacker.h 2002-11-18 05:21:48.000000000 +0100 -+++ b/dnshijacker.h 2010-09-19 01:16:28.000000000 +0200 -@@ -10 +10 @@ --#include <libnet.h> -+#include <libnet-1.0.h> -@@ -12 +12 @@ -- -+#include <resolv.h> ---- a/Makefile 2002-12-02 01:51:09.000000000 +0100 -+++ b/Makefile 2010-09-19 01:16:28.000000000 +0200 -@@ -4 +4 @@ -- gcc ask_dns.c -lnet `libnet-config --defines` -o ask_dns -+ $(CC) $(CFLAGS) $(LDFLAGS) ask_dns.c -lnet-1.0 `libnet-1.0-config --defines` -o ask_dns -@@ -7 +7 @@ -- gcc answer_dns.c -lnet `libnet-config --defines` -o answer_dns -+ $(CC) $(CFLAGS) $(LDFLAGS) answer_dns.c -lnet-1.0 `libnet-1.0-config --defines` -o answer_dns -@@ -10 +10 @@ -- gcc dnshijacker.c -lpcap -lnet -lresolv `libnet-config --defines` -o dnshijacker -+ $(CC) $(CFLAGS) $(LDFLAGS) dnshijacker.c -lpcap -lnet-1.0 -lresolv `libnet-1.0-config --defines` -o dnshijacker -@@ -13 +13 @@ -- gcc dnshijacker.c -lpcap -lnet -lresolv `libnet-config --defines` -o dnshijacker -DDEBUG -ggdb -+ $(CC) $(CFLAGS) $(LDFLAGS) dnshijacker.c -lpcap -lnet-1.0 -lresolv `libnet-1.0-config --defines` -o dnshijacker -DDEBUG -ggdb ---- a/README 2002-10-30 06:12:09.000000000 +0100 -+++ b/README 2010-09-19 01:16:28.000000000 +0200 -@@ -61 +61 @@ -- gcc dnshijacker.c -lpcap -lnet `libnet-config --defines` -o dnshijacker -+ gcc dnshijacker.c -lpcap -lnet-1.0 `libnet-1.0-config --defines` -o dnshijacker diff --git a/net-dns/dnshijacker/metadata.xml b/net-dns/dnshijacker/metadata.xml deleted file mode 100644 index 85e4ed814fa2..000000000000 --- a/net-dns/dnshijacker/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest index 5e894e467011..d0aa68a76b3d 100644 --- a/net-dns/dnsmasq/Manifest +++ b/net-dns/dnsmasq/Manifest @@ -1,2 +1,2 @@ -DIST dnsmasq-2.85.tar.xz 518316 BLAKE2B b7c081132c65d67b65f797bdbc603930c1509717bc1b5209b12f72fa3f01b4bae2f26a5387f95ef20317cd3d60e097c0b8bef5e019a35013f3ed2acce9fe9e89 SHA512 8beefe76b46f7d561f40d0900ba68b260a199cb62ab5b653746e3a1104c04fb8899b9e7a160a1be4fe8782bfb1607b556e9ffb9c25c4e99653e4bc74fcc03b09 -DIST dnsmasq-2.86.tar.xz 531404 BLAKE2B 27307c70cc90d6e27dbf8e87589b8c72622e93f402c3a431e06facc58a62af46a478d1fdbfb9808a91ff3d2f5da88a8d12de9755009b558d685903e4d2a34de3 SHA512 487eae0afbc8bb3d5282a729ffb0cb2c9bdc7d8e46e2e8aa114cd7c5d82e0fd66f49926e7fa4028577548d6f57e8a865aca17f33963a589874584d608ab2deaf +DIST dnsmasq-2.89.tar.xz 562700 BLAKE2B d8be39697ce7d4e7beacf6d94a9ba1842fe0099f7ed7ebb243a7e6e5af8c83195e4723e60841705aee70a43510279be8484a9474191ddcf17eac1ff4edc5389f SHA512 4384ed5b673e10eaf6532e6eaeb5c0a6b817581433cc28c632bdcbadbfc050a0ab73bc5b73c98d708cd39515bb3f72168714b0aa5f16436cebdd18020648d428 +DIST dnsmasq-2.90.tar.xz 570672 BLAKE2B e5a7a3f3b1457c94f508a17c32f1f14267ed61009058295e0202bee7a1798a3eb72c70e53c799f25fb6030b389c5eefc5e50845896b71b733c0fc302d730dff7 SHA512 e169de1892f935e219b0f49d90107f95cba42b40bca20bd3c973313c2cd4df58b929af6628cd988419051d81c3b4ccf8e9f816274df7d0840e79f5bf49602442 diff --git a/net-dns/dnsmasq/dnsmasq-2.86.ebuild b/net-dns/dnsmasq/dnsmasq-2.89-r1.ebuild index 24c56481d2a6..4566a538e82d 100644 --- a/net-dns/dnsmasq/dnsmasq-2.86.ebuild +++ b/net-dns/dnsmasq/dnsmasq-2.89-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,12 +8,12 @@ LUA_COMPAT=( lua5-{1..4} luajit ) inherit toolchain-funcs lua-single systemd DESCRIPTION="Small forwarding DNS server" -HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html" -SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz" +HOMEPAGE="https://thekelleys.org.uk/dnsmasq/doc.html" +SRC_URI="https://thekelleys.org.uk/dnsmasq/${P}.tar.xz" LICENSE="|| ( GPL-2 GPL-3 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2" IUSE+=" +loop +inotify ipv6 lua nettlehash nls script selinux static tftp" @@ -44,12 +44,18 @@ DEPEND="${COMMON_DEPEND} dev-libs/nettle:=[gmp] static? ( >=dev-libs/nettle-3.4[static-libs(+)] ) ) + nettlehash? ( + static? ( >=dev-libs/nettle-3.4[static-libs(+)] ) + ) " RDEPEND="${COMMON_DEPEND} dnssec? ( !static? ( >=dev-libs/nettle-3.4:=[gmp] ) ) + nettlehash? ( + !static? ( dev-libs/nettle:=[gmp] ) + ) selinux? ( sec-policy/selinux-dnsmasq ) " @@ -193,6 +199,9 @@ src_install() { if use dbus; then insinto /etc/dbus-1/system.d doins dbus/dnsmasq.conf + + docinto + dodoc dbus/DBus-interface fi if use dhcp-tools; then diff --git a/net-dns/dnsmasq/dnsmasq-2.85.ebuild b/net-dns/dnsmasq/dnsmasq-2.90.ebuild index dd3f481e3cd9..2af9808fc6ae 100644 --- a/net-dns/dnsmasq/dnsmasq-2.85.ebuild +++ b/net-dns/dnsmasq/dnsmasq-2.90.ebuild @@ -1,22 +1,22 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 LUA_COMPAT=( lua5-{1..4} luajit ) -inherit toolchain-funcs flag-o-matic lua-single systemd +inherit toolchain-funcs lua-single systemd DESCRIPTION="Small forwarding DNS server" -HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html" -SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz" +HOMEPAGE="https://thekelleys.org.uk/dnsmasq/doc.html" +SRC_URI="https://thekelleys.org.uk/dnsmasq/${P}.tar.xz" LICENSE="|| ( GPL-2 GPL-3 )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2" -IUSE+=" +inotify ipv6 lua nettlehash nls script selinux static tftp" +IUSE+=" +loop +inotify ipv6 lua nettlehash nls script selinux static tftp" DM_LINGUAS=(de es fi fr id it no pl pt_BR ro) @@ -44,12 +44,18 @@ DEPEND="${COMMON_DEPEND} dev-libs/nettle:=[gmp] static? ( >=dev-libs/nettle-3.4[static-libs(+)] ) ) + nettlehash? ( + static? ( >=dev-libs/nettle-3.4[static-libs(+)] ) + ) " RDEPEND="${COMMON_DEPEND} dnssec? ( !static? ( >=dev-libs/nettle-3.4:=[gmp] ) ) + nettlehash? ( + !static? ( dev-libs/nettle:=[gmp] ) + ) selinux? ( sec-policy/selinux-dnsmasq ) " @@ -103,7 +109,6 @@ pkg_pretend() { src_prepare() { default - sed -i -r 's:lua5.[0-9]+:lua:' Makefile || die sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" \ dnsmasq.conf.example || die } @@ -119,6 +124,7 @@ src_configure() { $(use_have -n dhcp dhcp dhcp6) $(use_have -n ipv6 ipv6 dhcp6) $(use_have -n id id) + $(use_have -n loop) $(use_have lua luascript) $(use_have -n script) $(use_have -n tftp) @@ -156,7 +162,12 @@ src_install() { emake \ PREFIX=/usr \ MANDIR=/usr/share/man \ + CC="$(tc-getCC)" \ + PKG_CONFIG="$(tc-getPKG_CONFIG)" \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ COPTS="${COPTS[*]}" \ + CONFFILE="/etc/${PN}.conf" \ DESTDIR="${ED}" \ install$(use nls && printf -- "-i18n\n") @@ -192,6 +203,9 @@ src_install() { if use dbus; then insinto /etc/dbus-1/system.d doins dbus/dnsmasq.conf + + docinto + dodoc dbus/DBus-interface fi if use dhcp-tools; then diff --git a/net-dns/dnssec-check/Manifest b/net-dns/dnssec-check/Manifest deleted file mode 100644 index 8678aeb0e8e2..000000000000 --- a/net-dns/dnssec-check/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST dnssec-check-2.2.tar.gz 174081 BLAKE2B ba150154448e2ac93e1a334165406c78d83bf1e9df53617161dc39fa6d5524bbd18e02659241cffa38a98ca76fb7ac2bad3c71c3896e2eb4f6cc86dd0f9b741c SHA512 8c417d2ee04e4f05b0a8978560ada0167e8d7cd0ae3bc365e83adb4ff06bd0526a25a971c7663651b38b53c4982f4406afddb0310bde10cc8c83dbc8da14aca5 diff --git a/net-dns/dnssec-check/dnssec-check-2.2.ebuild b/net-dns/dnssec-check/dnssec-check-2.2.ebuild deleted file mode 100644 index d5e58b4805f9..000000000000 --- a/net-dns/dnssec-check/dnssec-check-2.2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop qmake-utils - -DESCRIPTION="Tests local resolver for support of DNSSEC validation" -HOMEPAGE="https://www.dnssec-tools.org" -SRC_URI="https://www.dnssec-tools.org/download/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - dev-qt/qtdeclarative:5 - net-dns/dnssec-validator[threads] -" -DEPEND="${RDEPEND}" - -src_prepare() { - default - sed -e '/Exec=/s:/opt::' -i ${PN}.desktop || die -} - -src_configure() { - eqmake5 ${PN}.pro -} - -src_install() { - emake INSTALL_ROOT="${D}/usr" install - - doicon ${PN}.png - domenu ${PN}.desktop -} diff --git a/net-dns/dnssec-check/metadata.xml b/net-dns/dnssec-check/metadata.xml deleted file mode 100644 index 85e4ed814fa2..000000000000 --- a/net-dns/dnssec-check/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/net-dns/dnssec-root/Manifest b/net-dns/dnssec-root/Manifest index e45aebf827d8..4fdc207de438 100644 --- a/net-dns/dnssec-root/Manifest +++ b/net-dns/dnssec-root/Manifest @@ -1,3 +1,6 @@ DIST icannbundle-20181220.pem 13026 BLAKE2B 36f760c69e8e22036d7d927071be25508b6906838f0f468900385d5a3b9ce301c5688f9bdcab471abc5445a14bfbbe34ecb39ca131b01d9e6bbebcc3f1481241 SHA512 6a8b8bec6d104d31253a8acafc1694a095714537a39a4dc53a379ac900c83715f85d75ea7322de430557691ff31ec95ae5104f47b050da3568dd68377c2d5767 +DIST icannbundle-20210902.pem 1261 BLAKE2B cc21c2066478c3385528a0b4635d324b2033f9d2c939c4d7176bdd42ba6e606a23036326036c82c665db64bec13783347d4ff0830807f431830ccf22ddbc7f58 SHA512 c749bf4649480f2ddaa2ee0622a104c56c858e10e8c8768307ef24ca0000c7afe120837bedc61dee1eda302273040cb61060298dceed8dd6e83904f953e3f3f5 DIST root-anchors-20181220.p7s 4182 BLAKE2B 3d7d881f5ef066a3ff937cf638941f783e9b65834a13ba0efce766b59e8f469826718cea9e8968ca64e216b7ef1f1b4d7b73c3110ff2d65667a28e071cd52859 SHA512 af96358bbb7847fe7c30452f566771480a38a99f192775168ab8672332381958ffa6d2f4870f539e3957b6ecf62e0e3a80b1cffbd579beb3be6941ffba3f6fa9 DIST root-anchors-20181220.xml 690 BLAKE2B 548fd62073542f527e0b05c09ed1e668baafbb3cf7ca8afd1a32b67dd43d8958cef5005729c1bc11c2b1d0ddea48ca4db69a10b049f2e8a05536b93fff15e911 SHA512 e3adfaa4f8c9751599b8062787f4c3a81d3fa1478411f138f227c0cc972c7262bcf85578d333d36352da3628211b7d8ec4416528814a8937078dc393ce195f32 +DIST root-anchors-20210902.p7s 2551 BLAKE2B 2a079bf36d77a7cc480c197700bfb3f06bbc67f0cc2937954793fab1f4fee5fff4477ceb028a8796a5cb41c0fb1369df7df45b33410f78b03cb18794ddd564df SHA512 3d57446cc145081841ced6cda3ecff8fba1de5123f116d580cd3ea33011e26ad9dc790281590a06f68e551e22fef45aa2408a4e2ea80e35ec0a642454b45ca0d +DIST root-anchors-20210902.xml 690 BLAKE2B 548fd62073542f527e0b05c09ed1e668baafbb3cf7ca8afd1a32b67dd43d8958cef5005729c1bc11c2b1d0ddea48ca4db69a10b049f2e8a05536b93fff15e911 SHA512 e3adfaa4f8c9751599b8062787f4c3a81d3fa1478411f138f227c0cc972c7262bcf85578d333d36352da3628211b7d8ec4416528814a8937078dc393ce195f32 diff --git a/net-dns/dnssec-root/dnssec-root-20181220-r1.ebuild b/net-dns/dnssec-root/dnssec-root-20181220-r1.ebuild index 55219e448ce5..66f6fb19ae31 100644 --- a/net-dns/dnssec-root/dnssec-root-20181220-r1.ebuild +++ b/net-dns/dnssec-root/dnssec-root-20181220-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://data.iana.org/root-anchors/root-anchors.xml -> root-anchors-${P LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos" IUSE="" BDEPEND=">=dev-perl/XML-XPath-1.420.0" diff --git a/net-dns/dnssec-root/dnssec-root-20210902.ebuild b/net-dns/dnssec-root/dnssec-root-20210902.ebuild new file mode 100644 index 000000000000..2f5864b4566f --- /dev/null +++ b/net-dns/dnssec-root/dnssec-root-20210902.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +DESCRIPTION="The DNSSEC root key(s)" +HOMEPAGE="https://www.iana.org/dnssec/" +# check https://data.iana.org/root-anchors/ foro updates! +SRC_URI="https://data.iana.org/root-anchors/root-anchors.xml -> root-anchors-${PV}.xml + https://data.iana.org/root-anchors/root-anchors.p7s -> root-anchors-${PV}.p7s + https://data.iana.org/root-anchors/icannbundle.pem -> icannbundle-${PV}.pem" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" +IUSE="" + +BDEPEND=">=dev-perl/XML-XPath-1.420.0" +DEPEND="" + +src_unpack() { + mkdir "${S}" || die + + cp -t "${S}" "${DISTDIR}"/root-anchors-${PV}.{p7s,xml} "${DISTDIR}"/icannbundle-${PV}.pem || die +} + +src_prepare() { + mv root-anchors-${PV}.xml root-anchors.xml || die + mv root-anchors-${PV}.p7s root-anchors.p7s || die + mv icannbundle-${PV}.pem icannbundle.pem || die + + if has_version "dev-libs/openssl" ; then + # Signature validating is optional: + # - We are already downloading SRC, signature file & CA from same URI + # - We store checksums for distfiles + einfo "dev-libs/openssl is available, will validate signature of root-anchors.xml" + openssl smime -verify \ + -content root-anchors.xml \ + -in root-anchors.p7s -inform der \ + -CAfile icannbundle.pem \ + -noverify || die "OpenSSL S/Mime verify failed" + else + einfo "dev-libs/openssl is not available, skipping optional validation root-anchors.xml" + fi + + default +} + +src_compile() { + local KEYTAGS="" ALGORITHMS="" DIGESTTYPES="" DIGESTS="" i=1 + + KEYTAGS=$(xpath -q -e '/TrustAnchor/KeyDigest/KeyTag/node()' root-anchors.xml) + ALGORITHMS=$(xpath -q -e '/TrustAnchor/KeyDigest/Algorithm/node()' root-anchors.xml) + DIGESTTYPES=$(xpath -q -e '/TrustAnchor/KeyDigest/DigestType/node()' root-anchors.xml) + DIGESTS=$(xpath -q -e '/TrustAnchor/KeyDigest/Digest/node()' root-anchors.xml) + while [ 1 ] ; do + KEYTAG=$(echo ${KEYTAGS} | cut -d" " -f$i) + [[ "${KEYTAG}" != "" ]] || break + + ALGORITHM=$(echo ${ALGORITHMS} | cut -d" " -f$i) + [[ "${ALGORITHM}" == "" ]] && die "root-anchors.xml contains invalid key: ${KEYTAG} is missing algorithm" + + DIGESTTYPE=$(echo ${DIGESTTYPES} | cut -d" " -f$i) + [[ "${DIGESTTYPE}" == "" ]] && die "root-anchors.xml contains invalid key: ${KEYTAG} is missing digest type" + + DIGEST=$(echo ${DIGESTS} | cut -d" " -f$i) + [[ "${DIGEST}" == "" ]] && die "root-anchors.xml contains invalid key: ${KEYTAG} is missing digest" + + echo ". IN DS $KEYTAG $ALGORITHM $DIGESTTYPE $DIGEST" >> root-anchors.txt + i=`expr $i + 1` + done + + if [[ ! -s "root-anchors.txt" ]] ; then + die "Sanity check failed: root-anchors.txt is empty or does not exist!" + fi +} + +src_install() { + insinto /etc/dnssec + doins root-anchors.{p7s,txt,xml} icannbundle.pem +} diff --git a/net-dns/dnssec-root/metadata.xml b/net-dns/dnssec-root/metadata.xml index a3bdd9f74bf4..f63250c09310 100644 --- a/net-dns/dnssec-root/metadata.xml +++ b/net-dns/dnssec-root/metadata.xml @@ -5,8 +5,4 @@ <email>mschiff@gentoo.org</email> <name>Marc Schiffbauer</name> </maintainer> - <maintainer type="person"> - <email>whissi@gentoo.org</email> - <name>Thomas Deutschmann</name> - </maintainer> </pkgmetadata> diff --git a/net-dns/dnssec-tools/metadata.xml b/net-dns/dnssec-tools/metadata.xml index 85e4ed814fa2..b80cb1e0c7b9 100644 --- a/net-dns/dnssec-tools/metadata.xml +++ b/net-dns/dnssec-tools/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">DNSSEC-Tools/DNSSEC-Tools</remote-id> + </upstream> </pkgmetadata> diff --git a/net-dns/dnssec-validator/dnssec-validator-2.2.3-r2.ebuild b/net-dns/dnssec-validator/dnssec-validator-2.2.3-r3.ebuild index ca5e3e389089..20a94d1e224c 100644 --- a/net-dns/dnssec-validator/dnssec-validator-2.2.3-r2.ebuild +++ b/net-dns/dnssec-validator/dnssec-validator-2.2.3-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ S="${WORKDIR}/DNSSEC-Tools-dnssec-tools-${PV}/dnssec-tools/validator" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 arm ~arm64 x86" -IUSE="dlv +ipv6 +nsec3 static-libs +threads" +IUSE="dlv +nsec3 static-libs +threads" RDEPEND=">=dev-libs/openssl-1.1.0:0=" DEPEND="${RDEPEND}" @@ -37,11 +37,11 @@ src_prepare() { src_configure() { local myeconfargs=( $(use_with dlv) - $(use_with ipv6) $(use_with nsec3) $(use_enable static-libs static) $(use_with threads) --with-dnsval-conf="${EPREFIX}/etc/dnssec-tools/dnsval.conf" + --with-ipv6 --with-resolv-conf="${EPREFIX}/etc/dnssec-tools/resolv.conf" --with-root-hints="${EPREFIX}/etc/dnssec-tools/root.hints" ) diff --git a/net-dns/dnssec-validator/dnssec-validator-2.2.3-r4.ebuild b/net-dns/dnssec-validator/dnssec-validator-2.2.3-r4.ebuild new file mode 100644 index 000000000000..42bd3c677781 --- /dev/null +++ b/net-dns/dnssec-validator/dnssec-validator-2.2.3-r4.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Tools to ease the validation of DNSSEC related technologies" +HOMEPAGE="https://www.dnssec-tools.org/" +SRC_URI="https://github.com/DNSSEC-Tools/DNSSEC-Tools/archive/dnssec-tools-${PV}.tar.gz" +S="${WORKDIR}/DNSSEC-Tools-dnssec-tools-${PV}/dnssec-tools/validator" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm ~arm64 x86" +IUSE="dlv +nsec3 static-libs +threads" + +RDEPEND=">=dev-libs/openssl-1.1.0:0=" +DEPEND="${RDEPEND}" + +# Tests fail due "Cannot create context: -7" +RESTRICT="test" + +PATCHES=( + # Users LDFLAGS are not respected + # See https://github.com/DNSSEC-Tools/DNSSEC-Tools/pull/9 + "${FILESDIR}/${P}-ldflags.patch" + "${FILESDIR}/${PN}-2.2.3-musl-fix.patch" +) + +src_prepare() { + default + + mv configure.in configure.ac || die + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_with dlv) + $(use_with nsec3) + $(use_enable static-libs static) + $(use_with threads) + --with-dnsval-conf="${EPREFIX}/etc/dnssec-tools/dnsval.conf" + --with-ipv6 + --with-resolv-conf="${EPREFIX}/etc/dnssec-tools/resolv.conf" + --with-root-hints="${EPREFIX}/etc/dnssec-tools/root.hints" + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + # Install fails with MAKEOPTS > -j1 + # See https://github.com/DNSSEC-Tools/DNSSEC-Tools/issues/8 + emake -j1 DESTDIR="${D}" install + + einstalldocs + + find "${D}" -name '*.la' -delete || die +} diff --git a/net-dns/dnssec-validator/files/dnssec-validator-2.2.3-musl-fix.patch b/net-dns/dnssec-validator/files/dnssec-validator-2.2.3-musl-fix.patch new file mode 100644 index 000000000000..3d22d6a33582 --- /dev/null +++ b/net-dns/dnssec-validator/files/dnssec-validator-2.2.3-musl-fix.patch @@ -0,0 +1,29 @@ +https://github.com/DNSSEC-Tools/DNSSEC-Tools/pull/22 +From: Brahmajit Das <brahmajit.xyz@gmail.com> +Date: Fri, 15 Sep 2023 19:20:12 +0000 +Subject: [PATCH] Fix build on musl libc + +Function such as ns_name_pton are glibc specific and are not available +on other libc's like musl. This patch should make it possible to use +those internal function. The need for this patch is due to some of the +structs like __ns_sect are already defined on musl and glibc, thus would +result in an redefinition error. + +First discovered on Gentoo linux. + +Bug: https://bugs.gentoo.org/897862 +Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> +--- a/include/validator/validator-compat.h ++++ b/include/validator/validator-compat.h +@@ -896,6 +896,11 @@ typedef enum __ns_flag { + (cp) += NS_INT32SZ; \ + } while (0) + ++#endif /* HAVE_ARPA_NAMESER_H */ ++ ++/* eabi = android */ ++/* OpenBSD has arpa/nameser.h, but it doesn't define ns_msg */ ++#if !defined(HAVE_ARPA_NAMESER_H) || defined(eabi) || defined(ANDROID) ||defined(__OpenBSD__) || !defined(__GLIBC__) + int ns_name_uncompress(const u_char *, const u_char *, + const u_char *, char *, size_t); + int ns_name_compress(const char *, u_char *, size_t, diff --git a/net-dns/dnstop/dnstop-20140915-r2.ebuild b/net-dns/dnstop/dnstop-20140915-r3.ebuild index 78a41f4f5091..30758ba27b51 100644 --- a/net-dns/dnstop/dnstop-20140915-r2.ebuild +++ b/net-dns/dnstop/dnstop-20140915-r3.ebuild @@ -1,24 +1,26 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit autotools +inherit autotools flag-o-matic DESCRIPTION="Displays various tables of DNS traffic on your network" -HOMEPAGE="http://dnstop.measurement-factory.com/" -SRC_URI="http://dnstop.measurement-factory.com/src/${P}.tar.gz" +HOMEPAGE="https://github.com/measurement-factory/dnstop" +SRC_URI="http://dns.measurement-factory.com/tools/dnstop/src/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 arm ~hppa ppc x86" -IUSE="" RDEPEND="sys-libs/ncurses:0 net-libs/libpcap" DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}/${P}"-pkg-config.patch ) +PATCHES=( + "${FILESDIR}/${P}"-pkg-config.patch + "${FILESDIR}/${P}"-musl-fix.patch + ) src_prepare() { default @@ -26,6 +28,7 @@ src_prepare() { } src_configure() { + append-cflags -D_GNU_SOURCE econf --enable-ipv6 } diff --git a/net-dns/dnstop/files/dnstop-20140915-musl-fix.patch b/net-dns/dnstop/files/dnstop-20140915-musl-fix.patch new file mode 100644 index 000000000000..ddd1687c469e --- /dev/null +++ b/net-dns/dnstop/files/dnstop-20140915-musl-fix.patch @@ -0,0 +1,16 @@ +Fixes compilation with musl +Patch by Natanael Copa +https://gitlab.alpinelinux.org/alpine/aports/-/issues/2890 +https://bugs.gentoo.org/717202 + +--- a/dnstop.c ++++ b/dnstop.c +@@ -69,7 +69,7 @@ + #define ETHERTYPE_IPV6 0x86DD + #endif + +-#if defined(__linux__) || defined(__GLIBC__) || defined(__GNU__) ++#if defined(__GLIBC__) || defined(__GNU__) + #define uh_dport dest + #define uh_sport source + #endif diff --git a/net-dns/dnstop/metadata.xml b/net-dns/dnstop/metadata.xml index 08133e9b29b5..806de5e7629e 100644 --- a/net-dns/dnstop/metadata.xml +++ b/net-dns/dnstop/metadata.xml @@ -5,5 +5,7 @@ <upstream> <changelog>http://dns.measurement-factory.com/tools/dnstop/src/CHANGES</changelog> <doc>http://dns.measurement-factory.com/tools/dnstop/dnstop.8.html</doc> + <remote-id type="github">measurement-factory/dnstop</remote-id> + <bugs-to>https://github.com/measurement-factory/dnstop/issues</bugs-to> </upstream> </pkgmetadata> diff --git a/net-dns/dnsviz/Manifest b/net-dns/dnsviz/Manifest index 297267a16d5e..0043a830fa7f 100644 --- a/net-dns/dnsviz/Manifest +++ b/net-dns/dnsviz/Manifest @@ -1,4 +1,2 @@ -DIST dnsviz-0.8.2.tar.gz 404265 BLAKE2B c4ba6b5a7d6fee7c8e2cba0c90f29560152dd4beed1ef4d80a6a3bf9f81646ee8f0d61c38329233e300f2b434cb5d9e9d2a926dc72997ae68ff0a57e147bafcf SHA512 5414d9bda6c0bf5fdc5a84a09cb5833619110702749b12f87d63f5149de473f4bd1b6960c506c60ec5fc5ff82d789536cee70a299ff13c960a45776de2916c80 -DIST dnsviz-0.9.2.tar.gz 477947 BLAKE2B 62b94e6b05d1129d5c4655ff1faf8adb3c2eec868db6049e09dd180cebccab94412eee25293d83ec3e6bc5b18fae33ba0acfe3c3b30cececdd4952005879eab0 SHA512 8ad9e1aabb4704ff4939617532c32e5edde0d369efd2e4a7a6f30d33b8bac941b2d1073e98fed90e2a11438a0b1c18b8fafe07f4122fb888ebdb24bd2426abf6 -DIST dnsviz-0.9.3.tar.gz 477931 BLAKE2B e3e020fdddacdf06a4e7b78edade72136d6530dac5b243b30e97f609c9fb3b912fb6d6c00b8c54e17f1d2ba411a2b116f9cb89bfc51c01f43d8a1a03a00755aa SHA512 8ccaa29df6cc7824db7153950d5cb423d1ac7a76ae20a15b35c2e66d362b3340e23a9973f71b884ea7e7b861e2bb0051e32abc3e45795792a7db3b01b62449c5 -DIST dnsviz-0.9.4.tar.gz 477971 BLAKE2B 3c8bebcea89bc6e78247c45c4266f73be4f9f618bfaa48a47460a43deb4789fe71eaa77eb4ff59c2d8e863cdfdddaf5908279aad93ffd63fdbe16d0966aa943b SHA512 b88d0ddff6279078a5222b4250a404c39db6d896d57bba51c878c8b8d01582deda2fe67b5f6370d7a98389e09ad46bdf3903d77fee91c0291b14a9109f1739e3 +DIST dnsviz-0.10.0.gh.tar.gz 480916 BLAKE2B 51cdf40d91429447b01470f9356140ed53b488c6831bd06a8352493c0938d995c625024c2a976c2d7408a56085d15dcdbfe70486304a7d0c2168d93033939659 SHA512 0bc07ad6edc25986ca17d5e02bee6e120c2e3f01d3ee015a8ed8d8a6471f3e1b3176bc3194a0b9172cf789bac42548fb64f095fc94264bd8ea97a9b1ed484114 +DIST dnsviz-0.9.4.gh.tar.gz 477971 BLAKE2B 3c8bebcea89bc6e78247c45c4266f73be4f9f618bfaa48a47460a43deb4789fe71eaa77eb4ff59c2d8e863cdfdddaf5908279aad93ffd63fdbe16d0966aa943b SHA512 b88d0ddff6279078a5222b4250a404c39db6d896d57bba51c878c8b8d01582deda2fe67b5f6370d7a98389e09ad46bdf3903d77fee91c0291b14a9109f1739e3 diff --git a/net-dns/dnsviz/dnsviz-0.10.0.ebuild b/net-dns/dnsviz/dnsviz-0.10.0.ebuild new file mode 100644 index 000000000000..2638e94461f9 --- /dev/null +++ b/net-dns/dnsviz/dnsviz-0.10.0.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) + +inherit distutils-r1 optfeature + +DESCRIPTION="Tool suite for analysis and visualization of DNS and DNSSEC" +HOMEPAGE=" + https://dnsviz.net/ + https://github.com/dnsviz/dnsviz/ + https://pypi.org/project/dnsviz/ +" + +# 0.10.0 is untagged, see https://github.com/dnsviz/dnsviz/issues/122 +SRC_URI=" + https://github.com/dnsviz/dnsviz/archive/86ceba56e8ed23df0ec091b8750025ac374f3916.tar.gz + -> ${P}.gh.tar.gz +" + +SLOT="0" + +S="${WORKDIR}/${PN}-86ceba56e8ed23df0ec091b8750025ac374f3916" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-python/dnspython-1.13[${PYTHON_USEDEP}] + >=dev-python/m2crypto-0.37.0[${PYTHON_USEDEP}] + >=dev-python/pygraphviz-1.3.1[${PYTHON_USEDEP}] +" +BDEPEND=" + media-gfx/graphviz + test? ( + ${RDEPEND} + net-dns/bind + ) +" + +python_prepare_all() { + # Fix the ebuild to use correct FHS/Gentoo policy paths + sed -i \ + -e "s|share/doc/dnsviz|share/doc/${PF}|g" \ + "${S}"/setup.py \ + || die + + # skip online tests + rm tests/*_online.py tests/test_dnsviz_probe_options.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + eunittest -s tests -p "*.py" || die +} + +pkg_postinst() { + optfeature "Support for pre-deployment testing" net-dns/bind + optfeature "Support for DNSSEC signatures using GOST algorithm or digest" dev-libs/ghost-engine +} diff --git a/net-dns/dnsviz/dnsviz-0.8.2-r1.ebuild b/net-dns/dnsviz/dnsviz-0.8.2-r1.ebuild deleted file mode 100644 index e3feb492a94d..000000000000 --- a/net-dns/dnsviz/dnsviz-0.8.2-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) -inherit distutils-r1 optfeature - -DESCRIPTION="Tool suite for analysis and visualization of DNS and DNSSEC" -HOMEPAGE="https://dnsviz.net/" -SRC_URI="https://github.com/dnsviz/dnsviz/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=" - dev-python/dnspython[${PYTHON_USEDEP}] - >=dev-python/m2crypto-0.31.0[${PYTHON_USEDEP}] - >=dev-python/pygraphviz-1.3.1[${PYTHON_USEDEP}]" - -RDEPEND=" - ${DEPEND}" - -PATCHES=( "${FILESDIR}"/${PN}-0.8.2-add-ed448-support.patch ) - -python_prepare_all() { - # Fix the ebuild to use correct FHS/Gentoo policy paths for 0.8.2 - sed -i \ - -e "s|share/doc/dnsviz|share/doc/${PF}|g" \ - "${S}"/setup.py \ - || die - - distutils-r1_python_prepare_all -} - -python_test() { - distutils_install_for_testing - - "${EPYTHON}" tests/offline_tests.py -v || die - - # No need to pull in net-dns/bind for this small test - if hash named-checkconf &>/dev/null ; then - "${EPYTHON}" tests/local_probe_tests.py -v || die - else - einfo "Skipping local_probe_tests -- named-checkconf not found!" - fi -} - -pkg_postinst() { - optfeature "Support for pre-deployment testing" net-dns/bind - - # Warn about extra requirements for >=OpenSSL 1.1.0 - if has_version '=dev-libs/openssl-1.1*'; then - ewarn "With OpenSSL version 1.1.0 and later,the OpenSSL GOST Engine" - ewarn "is necessary to validate DNSSEC signatures with algorithm 12" - ewarn "(GOST R 34.10-2001) and digests of type 3 (GOST R 34.11-94)" - ewarn "OpenSSL GOST Engine can be get from --> dev-libs/gost-engine" - fi -} diff --git a/net-dns/dnsviz/dnsviz-0.9.2.ebuild b/net-dns/dnsviz/dnsviz-0.9.2.ebuild deleted file mode 100644 index d1f444d39db4..000000000000 --- a/net-dns/dnsviz/dnsviz-0.9.2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -inherit distutils-r1 optfeature - -DESCRIPTION="Tool suite for analysis and visualization of DNS and DNSSEC" -HOMEPAGE="https://dnsviz.net/" -SRC_URI="https://github.com/dnsviz/dnsviz/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND="test? ( net-dns/bind )" - -DEPEND=">=dev-python/dnspython-1.13[${PYTHON_USEDEP}] - >=dev-python/m2crypto-0.37.0[${PYTHON_USEDEP}] - >=dev-python/pygraphviz-1.3.1[${PYTHON_USEDEP}]" - -RDEPEND="${DEPEND}" - -python_prepare_all() { - # Fix the ebuild to use correct FHS/Gentoo policy paths - sed -i \ - -e "s|share/doc/dnsviz|share/doc/${PF}|g" \ - "${S}"/setup.py \ - || die - - distutils-r1_python_prepare_all -} - -python_test() { - distutils_install_for_testing - - "${EPYTHON}" tests/dnsviz_probe_run_offline.py -v || die - "${EPYTHON}" tests/dnsviz_print_options.py -v || die - "${EPYTHON}" tests/dnsviz_print_run.py -v || die - "${EPYTHON}" tests/dnsviz_graph_options.py -v || die - "${EPYTHON}" tests/dnsviz_graph_run.py -v || die - "${EPYTHON}" tests/dnsviz_grok_options.py -v || die - "${EPYTHON}" tests/dnsviz_grok_run.py -v || die -} - -pkg_postinst() { - optfeature "Support for pre-deployment testing" net-dns/bind - optfeature "Support for DNSSEC signatures using GOST algorithm or digest" dev-libs/ghost-engine -} diff --git a/net-dns/dnsviz/dnsviz-0.9.3.ebuild b/net-dns/dnsviz/dnsviz-0.9.3.ebuild deleted file mode 100644 index d1f444d39db4..000000000000 --- a/net-dns/dnsviz/dnsviz-0.9.3.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -inherit distutils-r1 optfeature - -DESCRIPTION="Tool suite for analysis and visualization of DNS and DNSSEC" -HOMEPAGE="https://dnsviz.net/" -SRC_URI="https://github.com/dnsviz/dnsviz/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND="test? ( net-dns/bind )" - -DEPEND=">=dev-python/dnspython-1.13[${PYTHON_USEDEP}] - >=dev-python/m2crypto-0.37.0[${PYTHON_USEDEP}] - >=dev-python/pygraphviz-1.3.1[${PYTHON_USEDEP}]" - -RDEPEND="${DEPEND}" - -python_prepare_all() { - # Fix the ebuild to use correct FHS/Gentoo policy paths - sed -i \ - -e "s|share/doc/dnsviz|share/doc/${PF}|g" \ - "${S}"/setup.py \ - || die - - distutils-r1_python_prepare_all -} - -python_test() { - distutils_install_for_testing - - "${EPYTHON}" tests/dnsviz_probe_run_offline.py -v || die - "${EPYTHON}" tests/dnsviz_print_options.py -v || die - "${EPYTHON}" tests/dnsviz_print_run.py -v || die - "${EPYTHON}" tests/dnsviz_graph_options.py -v || die - "${EPYTHON}" tests/dnsviz_graph_run.py -v || die - "${EPYTHON}" tests/dnsviz_grok_options.py -v || die - "${EPYTHON}" tests/dnsviz_grok_run.py -v || die -} - -pkg_postinst() { - optfeature "Support for pre-deployment testing" net-dns/bind - optfeature "Support for DNSSEC signatures using GOST algorithm or digest" dev-libs/ghost-engine -} diff --git a/net-dns/dnsviz/dnsviz-0.9.4-r1.ebuild b/net-dns/dnsviz/dnsviz-0.9.4-r1.ebuild new file mode 100644 index 000000000000..9b1dd27567af --- /dev/null +++ b/net-dns/dnsviz/dnsviz-0.9.4-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) + +inherit distutils-r1 optfeature + +DESCRIPTION="Tool suite for analysis and visualization of DNS and DNSSEC" +HOMEPAGE=" + https://dnsviz.net/ + https://github.com/dnsviz/dnsviz/ + https://pypi.org/project/dnsviz/ +" +SRC_URI=" + https://github.com/dnsviz/dnsviz/archive/v${PV}.tar.gz + -> ${P}.gh.tar.gz +" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-python/dnspython-1.13[${PYTHON_USEDEP}] + >=dev-python/m2crypto-0.37.0[${PYTHON_USEDEP}] + >=dev-python/pygraphviz-1.3.1[${PYTHON_USEDEP}] +" +BDEPEND=" + media-gfx/graphviz + test? ( + ${RDEPEND} + net-dns/bind + ) +" + +python_prepare_all() { + # Fix the ebuild to use correct FHS/Gentoo policy paths + sed -i \ + -e "s|share/doc/dnsviz|share/doc/${PF}|g" \ + "${S}"/setup.py \ + || die + + # skip online tests + rm tests/*_online.py tests/dnsviz_probe_options.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + eunittest -s tests -p "*.py" || die +} + +pkg_postinst() { + optfeature "Support for pre-deployment testing" net-dns/bind + optfeature "Support for DNSSEC signatures using GOST algorithm or digest" dev-libs/ghost-engine +} diff --git a/net-dns/dnsviz/dnsviz-0.9.4.ebuild b/net-dns/dnsviz/dnsviz-0.9.4.ebuild deleted file mode 100644 index b658637d8b29..000000000000 --- a/net-dns/dnsviz/dnsviz-0.9.4.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{7,8,9} ) -inherit distutils-r1 optfeature - -DESCRIPTION="Tool suite for analysis and visualization of DNS and DNSSEC" -HOMEPAGE="https://dnsviz.net/" -SRC_URI="https://github.com/dnsviz/dnsviz/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND="test? ( net-dns/bind )" - -DEPEND=">=dev-python/dnspython-1.13[${PYTHON_USEDEP}] - >=dev-python/m2crypto-0.37.0[${PYTHON_USEDEP}] - >=dev-python/pygraphviz-1.3.1[${PYTHON_USEDEP}]" - -RDEPEND="${DEPEND}" - -python_prepare_all() { - # Fix the ebuild to use correct FHS/Gentoo policy paths - sed -i \ - -e "s|share/doc/dnsviz|share/doc/${PF}|g" \ - "${S}"/setup.py \ - || die - - distutils-r1_python_prepare_all -} - -python_test() { - distutils_install_for_testing - - "${EPYTHON}" tests/dnsviz_probe_run_offline.py -v || die - "${EPYTHON}" tests/dnsviz_print_options.py -v || die - "${EPYTHON}" tests/dnsviz_print_run.py -v || die - "${EPYTHON}" tests/dnsviz_graph_options.py -v || die - "${EPYTHON}" tests/dnsviz_graph_run.py -v || die - "${EPYTHON}" tests/dnsviz_grok_options.py -v || die - "${EPYTHON}" tests/dnsviz_grok_run.py -v || die -} - -pkg_postinst() { - optfeature "Support for pre-deployment testing" net-dns/bind - optfeature "Support for DNSSEC signatures using GOST algorithm or digest" dev-libs/ghost-engine -} diff --git a/net-dns/dnsviz/files/dnsviz-0.8.2-add-ed448-support.patch b/net-dns/dnsviz/files/dnsviz-0.8.2-add-ed448-support.patch deleted file mode 100644 index 1d4d88e97e6d..000000000000 --- a/net-dns/dnsviz/files/dnsviz-0.8.2-add-ed448-support.patch +++ /dev/null @@ -1,182 +0,0 @@ -From 99bb0c7430c9f954582eabd3a9581fe0db6f2e81 Mon Sep 17 00:00:00 2001 -From: Pascal Ernster <git@hardfalcon.net> -Date: Mon, 22 Jul 2019 04:25:18 +0200 -Subject: [PATCH] Replace libnacl with python-cryptography, add support for - algo 16 (Ed448) - -Origin: https://github.com/dnsviz/dnsviz/pull/54 - ---- - Dockerfile | 2 +- - README.md | 8 ++++---- - contrib/dnsviz-py2.spec | 2 +- - contrib/dnsviz-py3.spec | 2 +- - dnsviz/crypto.py | 30 +++++++++++++++++++++++++----- - requirements.txt | 2 +- - setup.py | 2 +- - 7 files changed, 34 insertions(+), 14 deletions(-) - -diff --git a/Dockerfile b/Dockerfile -index dc6a0d9e..61a319de 100644 ---- a/Dockerfile -+++ b/Dockerfile -@@ -2,7 +2,7 @@ FROM alpine:edge - - RUN apk add python3 graphviz ttf-liberation libsodium bind bind-tools - RUN apk add --virtual builddeps linux-headers python3-dev graphviz-dev gcc libc-dev openssl-dev swig && \ -- pip3 install pygraphviz m2crypto dnspython libnacl && \ -+ pip3 install pygraphviz m2crypto dnspython cryptography && \ - apk del builddeps - - COPY . /tmp/dnsviz -diff --git a/README.md b/README.md -index e9dcda83..03d9c3dd 100644 ---- a/README.md -+++ b/README.md -@@ -41,7 +41,7 @@ Instructions for running in a Docker container are also available - - * M2Crypto (0.28.0 or later) - https://gitlab.com/m2crypto/m2crypto - --* libnacl - https://github.com/saltstack/libnacl -+* Cryptography (2.6 or later) - https://cryptography.io/ - - Note that the software versions listed above are known to work with the current - version of DNSViz. Other versions might also work well together, but might -@@ -85,7 +85,7 @@ $ source ~/myenv/bin/activate - ``` - (Note that this installs the dependencies that are python packages, but some of - these packages have non-python dependecies, such as Graphviz (required for --pygraphviz) and libsodium (required for libnacl), that are not installed -+pygraphviz) and OpenSSL (required for Cryptography), that are not installed - automatically.) - - Next download and install DNSViz from the Python Package Index (PyPI): -@@ -121,9 +121,9 @@ $ cp dist/dnsviz-*.tar.gz ~/rpmbuild/SOURCES/ - $ cp contrib/dnsviz-py${PY_VERS}.spec ~/rpmbuild/SPECS/dnsviz.spec - ``` - --Install dnspython, pygraphviz, M2Crypto, and libnacl. -+Install dnspython, pygraphviz, M2Crypto, and Cryptography. - ``` --$ sudo dnf install python${PY_VERS}-dns python${PY_VERS}-pygraphviz python${PY_VERS}-libnacl -+$ sudo dnf install python${PY_VERS}-dns python${PY_VERS}-pygraphviz python${PY_VERS}-cryptography - ``` - For python2: - ``` -diff --git a/contrib/dnsviz-py2.spec b/contrib/dnsviz-py2.spec -index 0bea597b..65033c95 100644 ---- a/contrib/dnsviz-py2.spec -+++ b/contrib/dnsviz-py2.spec -@@ -15,7 +15,7 @@ BuildRequires: make - Requires: python2-pygraphviz >= 1.3 - Requires: m2crypto >= 0.28.0 - Requires: python2-dns >= 1.13 --Requires: python2-libnacl -+Requires: python2-cryptography - - %description - DNSViz is a tool suite for analysis and visualization of Domain Name System -diff --git a/contrib/dnsviz-py3.spec b/contrib/dnsviz-py3.spec -index ef25f4b5..975f3e10 100644 ---- a/contrib/dnsviz-py3.spec -+++ b/contrib/dnsviz-py3.spec -@@ -15,7 +15,7 @@ BuildRequires: make - Requires: python3-pygraphviz >= 1.3 - Requires: python3-m2crypto >= 0.28.0 - Requires: python3-dns >= 1.13 --Requires: python3-libnacl -+Requires: python3-cryptography - - %description - DNSViz is a tool suite for analysis and visualization of Domain Name System -diff --git a/dnsviz/crypto.py b/dnsviz/crypto.py -index b011cbf3..283eac4d 100644 ---- a/dnsviz/crypto.py -+++ b/dnsviz/crypto.py -@@ -55,7 +55,7 @@ - 'M2Crypto >= 0.21.1': (set([1,5,7,8,10]), set([1,2,4]), set([1])), - 'M2Crypto >= 0.24.0': (set([3,6,13,14]), set(), set()), - 'M2Crypto >= 0.24.0 and either openssl < 1.1.0 or openssl >= 1.1.0 plus the OpenSSL GOST Engine': (set([12]), set([3]), set()), -- 'libnacl': (set([15]), set(), set()), -+ 'cryptography': (set([15,16]), set(), set()), - } - _logged_modules = set() - -@@ -72,12 +72,19 @@ - _supported_digest_algs.update(set([1,2,4])) - - try: -- from libnacl.sign import Verifier as ed25519Verifier -+ from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PublicKey - except ImportError: - pass - else: - _supported_algs.add(15) - -+try: -+ from cryptography.hazmat.primitives.asymmetric.ed448 import Ed448PublicKey -+except ImportError: -+ pass -+else: -+ _supported_algs.add(16) -+ - GOST_PREFIX = b'\x30\x63\x30\x1c\x06\x06\x2a\x85\x03\x02\x02\x13\x30\x12\x06\x07\x2a\x85\x03\x02\x02\x23\x01\x06\x07\x2a\x85\x03\x02\x02\x1e\x01\x03\x43\x00\x04\x40' - GOST_ENGINE_NAME = b'gost' - GOST_DIGEST_NAME = b'GOST R 34.11-94' -@@ -386,10 +393,21 @@ def _validate_rrsig_ec(alg, sig, msg, key): - - def _validate_rrsig_ed25519(alg, sig, msg, key): - try: -- verifier = ed25519Verifier(binascii.hexlify(key)) -- return verifier.verify(sig + msg) == msg -- except ValueError: -+ verifier = Ed25519PublicKey.from_public_bytes(key) -+ verifier.verify(sig, msg) -+ except: - return False -+ else: -+ return True -+ -+def _validate_rrsig_ed448(alg, sig, msg, key): -+ try: -+ verifier = Ed448PublicKey.from_public_bytes(key) -+ verifier.verify(sig, msg) -+ except: -+ return False -+ else: -+ return True - - def validate_rrsig(alg, sig, msg, key): - if not alg_is_supported(alg): -@@ -407,6 +425,8 @@ def validate_rrsig(alg, sig, msg, key): - return _validate_rrsig_ec(alg, sig, msg, key) - elif alg in (15,): - return _validate_rrsig_ed25519(alg, sig, msg, key) -+ elif alg in (16,): -+ return _validate_rrsig_ed448(alg, sig, msg, key) - - def get_digest_for_nsec3(val, salt, alg, iterations): - if not nsec3_alg_is_supported(alg): -diff --git a/requirements.txt b/requirements.txt -index d6b2de5e..af2be235 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,4 +1,4 @@ - dnspython - pygraphviz - m2crypto --libnacl -+cryptography -diff --git a/setup.py b/setup.py -index ba1016e3..b531c025 100644 ---- a/setup.py -+++ b/setup.py -@@ -135,7 +135,7 @@ def run(self): - 'pygraphviz (>=1.1)', - 'm2crypto (>=0.24.0)', - 'dnspython (>=1.11)', -- 'libnacl', -+ 'cryptography (>=2.6)', - ], - classifiers=[ - 'Development Status :: 5 - Production/Stable', diff --git a/net-dns/dnsviz/metadata.xml b/net-dns/dnsviz/metadata.xml index 30ed7d3b0c25..7c2d577552be 100644 --- a/net-dns/dnsviz/metadata.xml +++ b/net-dns/dnsviz/metadata.xml @@ -1,18 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>hasan.calisir@psauxit.com</email> - <name>Hasan ÇALIŞIR</name> - </maintainer> - <maintainer type="person"> - <email>whissi@gentoo.org</email> - <name>Thomas Deutschmann</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <longdescription lang="en"> DNSViz is a tool suite for analysis and visualization of Domain Name System (DNS) behavior, including its security extensions (DNSSEC). @@ -20,5 +9,6 @@ </longdescription> <upstream> <remote-id type="github">dnsviz/dnsviz</remote-id> + <remote-id type="pypi">dnsviz</remote-id> </upstream> </pkgmetadata> diff --git a/net-dns/dnswalk/Manifest b/net-dns/dnswalk/Manifest deleted file mode 100644 index 2eda9e7b4c15..000000000000 --- a/net-dns/dnswalk/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST dnswalk-2.0.2.tar.gz 27015 BLAKE2B fa7b357b8075b9f5bc2afc97764eaf5e6c07d9fb67f4f10cb89010d3bad1e550d3b13ef013669323ff5259c3784e3fdb2c03f1e2c5cab86388e96f25210002be SHA512 23e5408149ae65f69dbb6d0ecaf5b10233e2279a502f6e19f0dacde0e270ed4eed0aea72f8c12dd636228e99b0b115a335bb8327a0628ad1f36dae5f5572712c diff --git a/net-dns/dnswalk/dnswalk-2.0.2.ebuild b/net-dns/dnswalk/dnswalk-2.0.2.ebuild deleted file mode 100644 index 586828a9aac9..000000000000 --- a/net-dns/dnswalk/dnswalk-2.0.2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="dnswalk is a DNS database debugger" -HOMEPAGE="https://sourceforge.net/projects/dnswalk/" -SRC_URI="mirror://sourceforge/dnswalk/${P}.tar.gz" - -LICENSE="freedist" -SLOT="0" -KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux" - -RDEPEND=">=dev-perl/Net-DNS-0.12" - -S="${WORKDIR}" - -PATCHES=( "${FILESDIR}"/${PN}-2.0.2-portable-shebang.patch ) - -src_install() { - dobin dnswalk - - einstalldocs - dodoc do-dnswalk makereports sendreports rfc1912.txt dnswalk.errors - doman dnswalk.1 -} diff --git a/net-dns/dnswalk/files/dnswalk-2.0.2-portable-shebang.patch b/net-dns/dnswalk/files/dnswalk-2.0.2-portable-shebang.patch deleted file mode 100644 index f194ea738f1d..000000000000 --- a/net-dns/dnswalk/files/dnswalk-2.0.2-portable-shebang.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/dnswalk -+++ b/dnswalk -@@ -1,4 +1,4 @@ --#!/usr/contrib/bin/perl -+#!/usr/bin/env perl - # - # dnswalk Walk through a DNS tree, pulling out zone data and - # dumping it in a directory tree diff --git a/net-dns/dnswalk/metadata.xml b/net-dns/dnswalk/metadata.xml deleted file mode 100644 index a26b864eb60a..000000000000 --- a/net-dns/dnswalk/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">dnswalk</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-dns/dog/Manifest b/net-dns/dog/Manifest deleted file mode 100644 index dcf128bc21d2..000000000000 --- a/net-dns/dog/Manifest +++ /dev/null @@ -1,61 +0,0 @@ -DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa -DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671 -DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9 -DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b -DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b -DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9 -DIST cc-1.0.61.crate 53454 BLAKE2B 250a847faed1e7ae0a7d3d0f15511222a8cae499aed1e6736d65234d6915cd64abf0b01df5bcc38ff2800902854ed57b297fea2c63d41a480b02cb07863a7490 SHA512 c238590712c5359040ff9670fb60690d983b1a2aa53ab7031f552b4eb026c9e305f401ade77ee389eff90dbadfed6eb1978f67bfa143589a0e0ccf39edafb5d6 -DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339 -DIST core-foundation-0.7.0.crate 25384 BLAKE2B fde852b7673cc972da8d2f8663c2c8372fda36fd577d19c9536f9df929f649ccf94150e1e23a57013bee3cd8cbb6fb894c4fb3a5744171bc6be607cb27e2757e SHA512 919041f431e21783193c0661b82cbd15946a56e24e5100a6a9dc02476ddc714595fb0416ae182981ebf6a8b27181e3178135c27388b41ec848423d739a265da6 -DIST core-foundation-sys-0.7.0.crate 17033 BLAKE2B 26d190931c7462ed8c13de82e86d4417e0d130f97295c8435ec666be08c7bdc37894ef25647043970fa40eae1c63503d2ad7660c2ac17ef35d7d35698652e18b SHA512 b77566aed2b572bdbce6f71ca9dcc942ef96b628a7ed9680c4d3e3ada4a9dce90c1b439a8c7c7f22d68e51becf1d22b3262e227cafdf8cfe5f42db0ffb9dadc7 -DIST ctor-0.1.16.crate 4770 BLAKE2B d1234c086e370d0f86b3ef7011c111a0e439c94ce0aa25bf16fde3496056d3143e5798b7eee1d47c72d90f564dbba06e49d9e7cd381597276c1789b47fbcd574 SHA512 68b4a39ff49bd1ccbbf467da5f376cffb68ca10290ee9c587b063f7281c84d36a5c93ae242702e2135b53178de984d99d4dc0c246d4fbd566b8e81b573f442b3 -DIST datetime-0.5.1.crate 117665 BLAKE2B dcada54d4232d9c163ee89a6836946ef0d18fc14b2979b0067fadd06d1fc36d40cec1a9dfce9f6d990e4c3432d7af456b3dc12444f17defa81c1f7e4e210d847 SHA512 4927cd48aa1a53a3c65cc22dca134c05cc1e024068fac715bb0ba2f0a13b151c564ff356a46c95ba5d8aec6b468907c2bdd862e9d4a25d021ff51f3231a0f4d5 -DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482 -DIST dog-0.1.0.tar.gz 449366 BLAKE2B 7ea52027e73deb6db6cb67b89063cddd507246256b3ca93479a634ff6696ab6961f004da8272b4c535067868603d8218b44c3696e34b5126371a9e0d5fc36058 SHA512 03af5414b995710d22ea19bdbf382def4e53ae2870f396b4103546743c9cafcc445ee0819b6c8b7f435793fead5ebd03f091be89293a32847868a5544b4bc0e5 -DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232 -DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a -DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f -DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f -DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2 -DIST httparse-1.3.4.crate 23739 BLAKE2B 3abeb8bd0ca381ec3e7ef73ae51e1ff803583094d0cb12f5f4641fc4b8a312c3e1bf176a5d500a9770057fc9f9e925d437ce5173d99052d97439e773b70773c4 SHA512 97ff294eaf55684412d4e5a00c4077bd517fb1d51c420231281af09cc1dfa65a64adb4a18441db426db41cca91bd7032fbeb9fda02c1b0343466caa9dea8d457 -DIST ipconfig-0.2.2.crate 23017 BLAKE2B 8e8358c30cb53bbfd58e002ec0e2ec7540970ef80809aa1124af907f8858ba2723adc0fc16bb5f79f0413f0cf4f44b2107fc62faccff3e6c58133871bfd4c08a SHA512 50e5685bcc0c422ac840b51c8309890ce978f2bdd16acb57600c5c468f4cbaaa31dcf136bdaef6de279713d2e6c21f96e54c3b4c6bb0b29daa2635d6be0c50ba -DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692 -DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 -DIST libc-0.2.80.crate 513503 BLAKE2B d4bb5f789efa230ec9a7a2071652fc1e344669e5dfe3a2015694a1e8442cd5adc142f1374841a4f01984f132f0ad5f027913b201cd624f97e93d2bba31ad96a0 SHA512 69b2f4c67d29bd4fc8f6d0388036ac3ea0de2ba7387f56f4e4bd035696ba313fdce10d18107ef83490f574d6fff796b305d5f2c2bb03a7cf33b9136386e65b8c -DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec -DIST native-tls-0.2.4.crate 32170 BLAKE2B ff0e24edcf4b1014e95990dcff7a5f2139bd3623b6b9809cf8fb95fe11720b8fbd0e563bfdfead36935e4d162b7c0829f51934d8ec191ad34bfe1d2ad2ede4a5 SHA512 810cda42159f302d315f05dde222e3ee20cfa30958d48bc547837f7d6df87a1b51d1239de90cc2901f48581be978c11f8e758fd69213a8a8fa85c71266302632 -DIST openssl-0.10.30.crate 191808 BLAKE2B a6c76278f0d5fa3cb27eacab96d6430dcfb04deeb37cb8c6ecdc9b446f1bc8c44a69dcd83f50a8c50c56a49e8950303e807f05e90de3040a616f9c47a2f0caaa SHA512 058e9a483a9d0936e77626698bea5049608a9cc4e59a406b39c0b678f78c9207c5604286473dab334fe1d10d850fabcd786c6b54888a7affadb594f9459f5dc9 -DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a -DIST openssl-sys-0.9.58.crate 47014 BLAKE2B a66f90a5cd9fc82ff22ad7481ca9e4a92c78852d25ee4151c09d5a4d23823942c28bed5d96d5130eeae005573d7120e7e5187a071ae81ff10572cebcc7db8b3f SHA512 098993619ea8effaa03ab61a0eaebc938d23cb8e5284b2dd45499972ae4c79abc36cbeeb51f34861a36816de9d02e2cece673f32fd042880669e99cfff181481 -DIST output_vt100-0.1.2.crate 4062 BLAKE2B eed08c0a1800560d4f623f451d818e3c7f0dcd72fa99f4e5e6dd4934e50a9649011ec955e06728fd017d58bb9f36cecbeb9b4aa8c13c040225c24019f774e63a SHA512 b8eb00a541bebef2e0bb44975c4547fadfd4ab88a14aa8e31945f3c73531a550cf5729f1f3d18fae5cf36286b82d1a54fb08b28720f1592ab6cfe0814c8d3036 -DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9 -DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1 -DIST pretty_assertions-0.6.1.crate 61551 BLAKE2B 1e92be2282e42720c9e1d1d26f9e67515cf8aa528479e14bae9c79193652c435e9513e85b7958016c105ed581fcbae19ceaa742fac6b07374a2e6f7b57a689b2 SHA512 10010c6e6b02098def38a8e6cbfe34fd052fe5773628d57a8141c7933f868906870158b4d4b1948b752d2c5f7b2981806d5f835e125aa2447d408415ba764f71 -DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be -DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953 -DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e -DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84 -DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf -DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0 -DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184 -DIST regex-1.4.2.crate 236931 BLAKE2B f316b777df1c97aef2994745e1fbd9ca676b0da6bf4ffad4e54aa11014d39aed343884ede3648b5fd676dcec5e4840e9d84f4a4faaeefaf5a2d772e2c5b9ebf6 SHA512 a9bc8061b7563b8494b21f35bf3c2af5f58dcc1b0df4e25ab8d3f99ba66527d5163e2c04b229b688fcb7934961f718fab72f22d66fef53562c5d96a2fb3887de -DIST regex-syntax-0.6.21.crate 293572 BLAKE2B 49c499ba1c03447fe7c90f27147dc5d96daf815e330a4073fe293d3be594fab1d798d35a5e49f6af43c71befd47528927246c4ebb24b6a6a141135484bbecd31 SHA512 56507f4432804ea30820984f6cff03c3514988bc3e406b3ba3a89c36c9c5d75951e4acd000ba85b95bb83d253898ce7d7d282ed930e811e12bb644c4a5ec84fa -DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c -DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c -DIST schannel-0.1.19.crate 42755 BLAKE2B 11503202bb6c8fdff3cc716558a5c00ca7497f7aaa4890d332084754e0d1e1013719d5bd744d8aa12b8b042401f4828fda8453c104d5feeb9b437d7cc51b5273 SHA512 319d9931cdeaa0f6b50c46e413fed2b6e97b28fe8c4825d4e5ed0fe22083e686e124117bfab7c89bcce815a31a3478f8c230cdedae6a852a31719a0df34645b0 -DIST security-framework-0.4.4.crate 54841 BLAKE2B 75cc13b6053b491564b9e5329cf56c2da8800e61980a7030d51b09cabe2275a33844a4eb8b030dc96292c54211a37c2e638ec7c2dc4b1f650d57b4eb782b7413 SHA512 d17788d1300ce6d6a552f78b278f50056800aeeaadf7039576ce75e975aa371c2c9b86de2aa2c96e8b208d9240d246e0230f8788372f0e0f800d55a7ae8b7955 -DIST security-framework-sys-0.4.3.crate 10508 BLAKE2B fc49b876d89f479c8654059163566d4b7db870dcc21d7e1061ed92fb6e9e1e8751b292b726020f73cd931797436f7fac02ec26ae7306fc826e8c4063cacbc5f8 SHA512 a849f53a0d222299a83b38c55dec7d1282027c7dcd962c8e638afb9aa2f96bc961e93ca2bd34bce424f408d239e09b7baaacde8c2ab53e78860dc31f6bd76746 -DIST serde-1.0.117.crate 74505 BLAKE2B 59c5243dc10c00762659ef6352dbec857966540810117990f49eb1d19de435284151f8f0211000c264e7f7c6d3d4ada45c695384d397b31daae32d95efa13048 SHA512 77001954c9f1f7eb11c7a6293454dc0c581e536f4a07368dfcf62b744f42b620a6de8c67ca89138291b964d17f198274e2372fb72a9905dbbafe56276c5a9d5b -DIST serde_json-1.0.59.crate 114956 BLAKE2B 27552d21b80d88cc3c643b25e5f0105c0d79a7c74c5bc3c2cdcc68050103ad73b75f7ee9d1d5afb60adbae33c351091b180cb1f8aa17c80f06cce4fb4c57f2d8 SHA512 2f9bf96fa770f9be9c43fc889e1671e9bb883f49a820aa69a1709d9f679f21f01cef2b771eea4d1fe7994cf850af44577710521fffdc4cc46d0dc6f913842075 -DIST socket2-0.3.15.crate 29282 BLAKE2B 9ebbdd90073120d0457469907b02ac15cdc1805114fee8475b7be23478ed0215dbbae4506219d95b073f56f668e5b6b808f262da5c9ebae1ddce496166104fdd SHA512 dcd2ba06911d56ceb6859cd4053d8d9d32d485c71af86978dab0d4fd53c96e486c8729f93842711e8e9f2b0f8f4604c904c5ef2426c96660dbc05b3bed237d64 -DIST syn-1.0.48.crate 225747 BLAKE2B f7bfc4c38dec562a6dc7ecb7120c6df5e25ddc8591762bf5018ee0efa506613c9462a79e0e9cbd952cf5fa083abc164608d594bf2a47d226de4b4bdf02da050c SHA512 16b022a418eb9a7e5d651197561c329f749050a1710ff03b1af9a5f580543d00a1724826e0ced044d6ee4ad55dc615fff5a71ad72755e1685c429dc5853d93b3 -DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5 -DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0 -DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2 -DIST vcpkg-0.2.10.crate 11504 BLAKE2B ab7e64091fd2c12292282a0311716468bcf584dd3764cd0c4803d40702104a57ace0a138b06cb1429a166a61e069788b2c45c3286d3f4c5bbf6ac30e816add14 SHA512 4c790344fd3510eaaca5e1539cd676c60124b2ef157e85f89322f294ab6831c2acf6efed1529de4bb23d9abfd0b5f962eaf8d3221c827b0718834d152b28c141 -DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47 -DIST widestring-0.4.3.crate 26215 BLAKE2B 7e5cdbb58a23004bb76cc12d451fd891ef08c05f730b059eb62a0f5e9482dde58c4059f9c0892fb1ebebbc8ee85dd20ece3ebf12c48790dca5eaeeb20b81dc34 SHA512 48561bd8a3b589f2a0328d1286177fbc6c5bc534756898912cbaab81d742b64ef898eed75073484d5e30762ceda9d2e88710074e7e9ce1a7dd43b5d871de3860 -DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 -DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 -DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 -DIST winreg-0.6.2.crate 19338 BLAKE2B d866995d54b69077efc1bb900235a4c00d9e69779cb365ad2fc97686a6c13de6a91d6204856ea35a18b86a7f32e8d4ac1ea2d2c096d7dd3e42f78400752cd3e2 SHA512 a2b6a7a0fcdb1f81dab62e1626089b6fd753a2233f9496505420ccb7997765c34293ce07b724b8179646345e0f6819eca88a6c167a03d8439a386fe53e184102 diff --git a/net-dns/dog/dog-0.1.0.ebuild b/net-dns/dog/dog-0.1.0.ebuild deleted file mode 100644 index b129d26d04b9..000000000000 --- a/net-dns/dog/dog-0.1.0.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CRATES=" -ansi_term-0.11.0 -ansi_term-0.12.1 -atty-0.2.14 -autocfg-1.0.1 -bitflags-1.2.1 -byteorder-1.3.4 -cc-1.0.61 -cfg-if-0.1.10 -core-foundation-0.7.0 -core-foundation-sys-0.7.0 -ctor-0.1.16 -datetime-0.5.1 -difference-2.0.0 -foreign-types-0.3.2 -foreign-types-shared-0.1.1 -getopts-0.2.21 -getrandom-0.1.15 -hermit-abi-0.1.17 -httparse-1.3.4 -ipconfig-0.2.2 -itoa-0.4.6 -lazy_static-1.4.0 -libc-0.2.80 -log-0.4.11 -native-tls-0.2.4 -openssl-0.10.30 -openssl-probe-0.1.2 -openssl-sys-0.9.58 -output_vt100-0.1.2 -pkg-config-0.3.19 -ppv-lite86-0.2.10 -pretty_assertions-0.6.1 -proc-macro2-1.0.24 -quote-1.0.7 -rand-0.7.3 -rand_chacha-0.2.2 -rand_core-0.5.1 -rand_hc-0.2.0 -redox_syscall-0.1.57 -regex-1.4.2 -regex-syntax-0.6.21 -remove_dir_all-0.5.3 -ryu-1.0.5 -schannel-0.1.19 -security-framework-0.4.4 -security-framework-sys-0.4.3 -serde-1.0.117 -serde_json-1.0.59 -socket2-0.3.15 -syn-1.0.48 -tempfile-3.1.0 -unicode-width-0.1.8 -unicode-xid-0.2.1 -vcpkg-0.2.10 -wasi-0.9.0+wasi-snapshot-preview1 -widestring-0.4.3 -winapi-0.3.9 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-x86_64-pc-windows-gnu-0.4.0 -winreg-0.6.2 -" - -inherit cargo - -DESCRIPTION="A command-line DNS client like dig" -HOMEPAGE="https://dns.lookup.dog https://github.com/ogham/dog" -SRC_URI="$(cargo_crate_uris ${CRATES}) - https://github.com/ogham/dog/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="EUPL-1.2 Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 MIT Unlicense unicode" -SLOT="0" -KEYWORDS="~amd64" -IUSE="ssl" - -RDEPEND=" - ssl? ( dev-libs/openssl:0= ) - !sys-apps/dog -" -DEPEND=" - ${RUST_DEPEND} - dev-go/go-md2man - ${RDEPEND} -" -QA_FLAGS_IGNORED="/usr/bin/dog" - -src_prepare() { - default - sed -e '/mutagen/d' -e '/features/d' -i dns/Cargo.toml || die - go-md2man -in man/dog.1.md -out dog.1 || die - rm -rf man || die -} - -src_configure() { - local myfeatures=( - $(usex ssl tls '') - $(usex ssl https '') - ) - cargo_src_configure --no-default-features -} - -src_install() { - cargo_src_install - doman dog.1 -} diff --git a/net-dns/dog/metadata.xml b/net-dns/dog/metadata.xml deleted file mode 100644 index d49f098e416e..000000000000 --- a/net-dns/dog/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>zmedico@gentoo.org</email> - <name>Zac Medico</name> - </maintainer> - <upstream> - <remote-id type="github">ogham/dog</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-dns/ez-ipupdate/ez-ipupdate-3.0.11.13.3_beta8-r5.ebuild b/net-dns/ez-ipupdate/ez-ipupdate-3.0.11.13.3_beta8-r5.ebuild new file mode 100644 index 000000000000..d6efd51f9501 --- /dev/null +++ b/net-dns/ez-ipupdate/ez-ipupdate-3.0.11.13.3_beta8-r5.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_BETA="$(ver_cut 6-)" +MY_PATCH="$(ver_cut 4-5)" +MY_PV="$(ver_cut 1-3)${MY_BETA/beta/b}" + +inherit readme.gentoo-r1 systemd + +DESCRIPTION="Dynamic DNS client for lots of dynamic dns services" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI=" + mirror://debian/pool/main/e/ez-ipupdate/${PN}_${MY_PV}.orig.tar.gz + mirror://debian/pool/main/e/ez-ipupdate/${PN}_${MY_PV}-${MY_PATCH}.diff.gz +" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~riscv ~sparc ~x86" + +RDEPEND=" + acct-group/ez-ipupd + acct-user/ez-ipupd +" + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS=" +Please create one or more config files in +/etc/ez-ipupdate/. A bunch of samples can +be found in the doc directory. + +All config files must have a '.conf' extension. + +If you are using openRC you need to: +- Please do not use the 'run-as-user', 'run-as-euser', +'cache-file' and 'pidfile' options, since these are +handled internally by the init-script. + +-If you want to use ez-ipupdate in daemon mode, +please add 'daemon' to the config file(s) and +add the ez-ipupdate init-script to the default runlevel. +Without the 'daemon' option, you can run the +init-script with the 'update' parameter inside +your PPP ip-up script. +" + +PATCHES=( + # adding members.3322.org support + "${FILESDIR}/${P}-3322.diff" + # adding www.dnsexit.com support + "${FILESDIR}/${P}-dnsexit.diff" + # make ez-ipupdate work with iproute2/dhcpcd under linux (bug #318905) + "${FILESDIR}/${P}-linux.diff" + # allows to set IPv6 via -a option, (bug #432764) + "${FILESDIR}/${P}-ipv6.diff" + # repair format mask issues + "${FILESDIR}/${P}-fix-format-mask.patch" + # comment unsed functions, (bug #897848) + "${FILESDIR}/${P}-clang16.patch" +) + +src_prepare() { + # Debian patches + eapply "${WORKDIR}/${PN}_${MY_PV}-${MY_PATCH}.diff" + # repair/apply additional Debian patches + sed -i -e "s|^\(---\s*\)\.\./|\1|g" debian/patches/*.diff || die + eapply debian/patches + + default + + # comment out obsolete options + sed -i -e "s:^\(run-as-user.*\):#\1:g" \ + -e "s:^\(cache-file.*\):#\1:g" ex*conf || die + + # make 'missing' executable (bug #103480) + chmod +x missing || die +} + +src_configure() { + econf --bindir=/usr/sbin +} + +src_install() { + emake DESTDIR="${D}" install + newinitd "${FILESDIR}/ez-ipupdate.initd" ez-ipupdate + systemd_dounit "${FILESDIR}/${PN}.service" + keepdir /etc/ez-ipupdate + + # install docs + dodoc README + newdoc debian/README.Debian README.debian + newdoc debian/changelog ChangeLog.debian + newdoc CHANGELOG ChangeLog + doman debian/ez-ipupdate.8 + + # install example configs + docinto examples + dodoc ex*conf + + readme.gentoo_create_doc +} + +pkg_postinst() { + chmod 750 /etc/ez-ipupdate /var/cache/ez-ipupdate || die + chown ez-ipupd:ez-ipupd /etc/ez-ipupdate /var/cache/ez-ipupdate || die + + readme.gentoo_print_elog + + if [[ -f /etc/ez-ipupdate.conf ]]; then + elog "The ez-ipupdate init-script can now handle more" + elog "than one config file. New config file location is" + elog "/etc/ez-ipupdate/*.conf" + if [[ ! -f /etc/ez-ipupdate/default.conf ]]; then + mv -f /etc/ez-ipupdate.conf /etc/ez-ipupdate/default.conf || die + elog "Your old configuration has been moved to" + elog "/etc/ez-ipupdate/default.conf" + fi + fi +} diff --git a/net-dns/ez-ipupdate/files/ez-ipupdate-3.0.11.13.3_beta8-clang16.patch b/net-dns/ez-ipupdate/files/ez-ipupdate-3.0.11.13.3_beta8-clang16.patch new file mode 100644 index 000000000000..5d056326c4da --- /dev/null +++ b/net-dns/ez-ipupdate/files/ez-ipupdate-3.0.11.13.3_beta8-clang16.patch @@ -0,0 +1,33 @@ +From: Brahmajit Das <brahmajit.xyz@gmail.com> +Date: Thu, 28 Sep 2023 18:45:45 +0000 +Subject: [PATCH 1/1] ez-ipupdate.c: comment socketopen and socketclose + +From the looks at it, socketopen and socketclose and not used under +__linux__ and hence it's better to not use them and cause unnecessary +compilation bugs. + +Bug: https://bugs.gentoo.org/897848 +Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> +--- a/ez-ipupdate.c ++++ b/ez-ipupdate.c +@@ -5182,7 +5182,7 @@ int main(int argc, char **argv) + struct sockaddr_in sin; + int sock; + +- socketopen(sock); ++ /*socketopen(sock);*/ + if(get_if_addr(sock, interface, &sin) == 0) + { + if(address) { free(address); } +@@ -5193,7 +5193,7 @@ int main(int argc, char **argv) + show_message("could not resolve ip address for %s\n", interface); + exit(1); + } +- socketclose(sock); ++ /*socketclose(sock);*/ + } + + for(i=0; i<ntrys; i++) +-- +2.42.0 + diff --git a/net-dns/fpdns/Manifest b/net-dns/fpdns/Manifest index d49483f1e17b..2ff396154d77 100644 --- a/net-dns/fpdns/Manifest +++ b/net-dns/fpdns/Manifest @@ -1 +1,2 @@ DIST fpdns-0.10.0_pre20130404.tar.gz 931723 BLAKE2B cab459afee74ef5d8163a25b98c123b799270e6d3293f155a340ebdbfbc86266fbffa999d31928c9b1a732898b0adf4a49e97469f9ae992a0e38f9478431e84c SHA512 1a4d9c1cb666efa3f48dcca2b5cd04793e92727359652095572b17479f5343479c57d2937f1fff8070c071a2698eda5c4dff981caf86436f184f0b076b0fa0b3 +DIST fpdns-20190131.tar.gz 933415 BLAKE2B 58208f9b1c1204a9cddcc390a8814158b0cbd5ed958c1b4d30588d2bc422c20047732b47a0358484dc21b255e67f2b312dd3af82e8ec52253345651d8c38fa67 SHA512 cde6e3ae9661b82456b65e1b309c1190b63b83406fcc75971b2903d7b38a16cf46b2e2c3d9b3f577c20a8f7ffc077243414fc5e53bed962c85512e2ea6aec15b diff --git a/net-dns/fpdns/fpdns-20190131.ebuild b/net-dns/fpdns/fpdns-20190131.ebuild new file mode 100644 index 000000000000..b556dd7766a9 --- /dev/null +++ b/net-dns/fpdns/fpdns-20190131.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit perl-module + +DESCRIPTION="Fingerprinting DNS servers" +HOMEPAGE="https://github.com/kirei/fpdns/" +SRC_URI="https://github.com/kirei/fpdns/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=">=dev-perl/Net-DNS-0.74" + +src_install() { + dobin apps/fpdns + insinto "${VENDOR_LIB}"/Net/DNS/ + doins lib/Net/DNS/Fingerprint.pm +} diff --git a/net-dns/fpdns/metadata.xml b/net-dns/fpdns/metadata.xml index 7b8047263afb..d6cd618589b3 100644 --- a/net-dns/fpdns/metadata.xml +++ b/net-dns/fpdns/metadata.xml @@ -3,26 +3,26 @@ <pkgmetadata> <!-- maintainer-needed --> <longdescription> -A nameserver basically responds to a query. Interoperability is an obvious -requirement here. The standard protocol behaviour of different DNS -implementations is expected to be the same. + A nameserver basically responds to a query. Interoperability is an obvious + requirement here. The standard protocol behaviour of different DNS + implementations is expected to be the same. -Requirements for protocol behaviour of DNS implementations is widely documented -in the case of 'common' dns messages. The DNS protocol is over 20 years old and -since its inception, there have been over 40 independent DNS implementations, -while some implementations have over 20 versions. + Requirements for protocol behaviour of DNS implementations is widely documented + in the case of 'common' dns messages. The DNS protocol is over 20 years old and + since its inception, there have been over 40 independent DNS implementations, + while some implementations have over 20 versions. -The methodology used to identify individual nameserver implementations is based -on "borderline" protocol behaviour. The DNS protocol offers a multitude of -message bits, response types, opcodes, classes, query types and label types in a -fashion that makes some mutually exclusive while some are not used in a query -messages at all. Not every implementation offers the full set of features the -DNS protocol set currently has. Some implementations offer features outside the -protocol set, and there are implementations that do not conform to standards. + The methodology used to identify individual nameserver implementations is based + on "borderline" protocol behaviour. The DNS protocol offers a multitude of + message bits, response types, opcodes, classes, query types and label types in a + fashion that makes some mutually exclusive while some are not used in a query + messages at all. Not every implementation offers the full set of features the + DNS protocol set currently has. Some implementations offer features outside the + protocol set, and there are implementations that do not conform to standards. -Also, new features added to - or bugs removed allow for differentiations between -versions of an implementation. -</longdescription> + Also, new features added to - or bugs removed allow for differentiations between + versions of an implementation. + </longdescription> <upstream> <remote-id type="github">kirei/fpdns</remote-id> </upstream> diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest index 43f673dd12e0..77ae018e7a78 100644 --- a/net-dns/getdns/Manifest +++ b/net-dns/getdns/Manifest @@ -1 +1 @@ -DIST getdns-1.7.0.tar.gz 690885 BLAKE2B 25e81c01c5da0a5494dc25077257f8f98210b442b7ca65c895aa2a40af180e840aa53205ae84ed242cbd6c55f8830caf255db9d7f607dde39f118ab7494a7072 SHA512 d09b8bdd0b4a3df2d25b9689166226da83a5a7eb2c7436487dc637539ac6077624a4d66cf684c4e6c4911561872c6bd191af3afd90d275b1662e4c6c47773ef6 +DIST getdns-1.7.2.tar.gz 702969 BLAKE2B 668a754200b816790f39a772d89c28e14bc5dbd041e07d9e53605ad44d63d6637078b66881c35dda62ed61622142797cc8f0041522e076cf551651fca688053a SHA512 6c4a75a4696c46ec8bd9e9659a93fd81f3490b43da28a4c95f99a766027c7588fc493a8ac51563afb8f975c0e5b77d5ea67014d80e78ee2bb17fba1d1073d19f diff --git a/net-dns/getdns/files/getdns-1.7.0-docdir.patch b/net-dns/getdns/files/getdns-1.7.0-docdir.patch deleted file mode 100644 index e674a3b2b81d..000000000000 --- a/net-dns/getdns/files/getdns-1.7.0-docdir.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://github.com/getdnsapi/getdns/pull/509 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1101,9 +1101,8 @@ endif () - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/getdns DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION share/man) - --set(docdir share/doc/getdns) --install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${docdir}) --install(FILES spec/index.html DESTINATION ${docdir}/spec) -+install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${CMAKE_INSTALL_DOCDIR}) -+install(FILES spec/index.html DESTINATION ${CMAKE_INSTALL_DOCDIR}/spec) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/getdns.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - - install(CODE "message(\"\ diff --git a/net-dns/getdns/files/getdns-1.7.2-clang16.patch b/net-dns/getdns/files/getdns-1.7.2-clang16.patch new file mode 100644 index 000000000000..4b6b58f285a0 --- /dev/null +++ b/net-dns/getdns/files/getdns-1.7.2-clang16.patch @@ -0,0 +1,55 @@ +https://github.com/getdnsapi/getdns/commit/9c076ca34b9569eb60861da9a99f895a49d5a7b4 + +From 9c076ca34b9569eb60861da9a99f895a49d5a7b4 Mon Sep 17 00:00:00 2001 +From: Willem Toorop <willem@nlnetlabs.nl> +Date: Mon, 22 Aug 2022 10:40:35 +0200 +Subject: [PATCH] Issue #526 Some gldns files need stdlib + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -262,6 +262,7 @@ check_include_file(inttypes.h HAVE_INTTYPES_H) + check_include_file(limits.h HAVE_LIMITS_H) + check_include_file(sys/limits.h HAVE_SYS_LIMITS_H) + check_include_file(stdarg.h HAVE_STDARG_H) ++check_include_file(stddef.h HAVE_STDDEF_H) + check_include_file(stdint.h HAVE_STDINT_H) + check_include_file(stdio.h HAVE_STDIO_H) + check_include_file(stdlib.h HAVE_STDLIB_H) +--- a/cmake/include/cmakeconfig.h.in ++++ b/cmake/include/cmakeconfig.h.in +@@ -15,6 +15,7 @@ + #cmakedefine HAVE_LIMITS_H 1 + #cmakedefine HAVE_SYS_LIMITS_H 1 + #cmakedefine HAVE_STDARG_H 1 ++#cmakedefine HAVE_STDDEF_H 1 + #cmakedefine HAVE_STDINT_H 1 + #cmakedefine HAVE_STDIO_H 1 + #cmakedefine HAVE_STDLIB_H 1 +@@ -241,6 +242,10 @@ + # define FD_SETSIZE 1024 + # endif + ++#ifdef __cplusplus ++extern "C" { ++#endif ++ + /* the version of the windows API enabled */ + # ifndef WINVER + # define WINVER 0x0600 // 0x0502 +@@ -307,12 +312,11 @@ + #include <string.h> + #endif + +-#ifdef __cplusplus +-extern "C" { ++#ifdef HAVE_STDLIB_H ++#include <stdlib.h> + #endif + +-#if STDC_HEADERS +-#include <stdlib.h> ++#ifdef HAVE_STDDEF_H + #include <stddef.h> + #endif + + diff --git a/net-dns/getdns/getdns-1.7.0-r1.ebuild b/net-dns/getdns/getdns-1.7.2-r1.ebuild index 85df2006a4a2..e7fa20d82afb 100644 --- a/net-dns/getdns/getdns-1.7.0-r1.ebuild +++ b/net-dns/getdns/getdns-1.7.2-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 _SRCURI_P="${P/%_beta1/-beta.1}" @@ -48,12 +48,12 @@ RDEPEND=" ) " BDEPEND=" - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " PATCHES=( "${FILESDIR}/${PN}-1.4.2-stubby.service.patch" - "${FILESDIR}/${PN}-1.7.0-docdir.patch" + "${FILESDIR}/${P}-clang16.patch" ) src_configure() { diff --git a/net-dns/getdns/metadata.xml b/net-dns/getdns/metadata.xml index 95f99f1eec2d..115e5fa205a5 100644 --- a/net-dns/getdns/metadata.xml +++ b/net-dns/getdns/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="stubby">Add Stubby DNS Privacy Deamon</flag> <flag name="getdns-query">Add getdns_query tool</flag> diff --git a/net-dns/hash-slinger/Manifest b/net-dns/hash-slinger/Manifest index e200ab15ce5a..a9ac022e7d12 100644 --- a/net-dns/hash-slinger/Manifest +++ b/net-dns/hash-slinger/Manifest @@ -1 +1 @@ -DIST hash-slinger-3.1.tar.gz 38224 BLAKE2B 35d60b648704e1aa96fbec000ff07c06a31a1f45c58f708fdad1bab464849d4de60963acde9f2c26eb4304454ed1406f698c8007dbf471794f16f26b8ebdb080 SHA512 04ad33b718f716cfd08bd52ee50db81372b7dc13895695e1b23cf904306166b73e388285c7cce8a0a0e5003e783bc61dea4c9ede7a44f22c16e24e2411c7f427 +DIST hash-slinger-3.2.tar.gz 38376 BLAKE2B 8c89f9a372818166c862d97354a60dddc2795c70f23b39225ad0fc3a2657cc5e048dca228dc004db0240fcf80e74bc799528d3459a65e6de347a493df5abf7b3 SHA512 01a25b3bc00bd9cd86c448f087c48ad04248a5a8755c2f154272b833efdce058a1fc62ea3f5cc6e9ff35180754b3e44db03c4e4888fd9051b749eff5fc8c3110 diff --git a/net-dns/hash-slinger/hash-slinger-3.1.ebuild b/net-dns/hash-slinger/hash-slinger-3.2-r1.ebuild index 330f6cc1075e..d4c705076a21 100644 --- a/net-dns/hash-slinger/hash-slinger-3.1.ebuild +++ b/net-dns/hash-slinger/hash-slinger-3.2-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit python-single-r1 @@ -28,7 +28,7 @@ RDEPEND=" net-dns/unbound[python,${PYTHON_SINGLE_USEDEP}] ipsec? ( net-vpn/libreswan[dnssec] ) openpgp? ( $(python_gen_cond_dep 'dev-python/python-gnupg[${PYTHON_USEDEP}]') ) - ssh? ( net-misc/openssh ) + ssh? ( virtual/openssh ) " src_install() { diff --git a/net-dns/hash-slinger/metadata.xml b/net-dns/hash-slinger/metadata.xml index 2f270db8354d..a49bf9825814 100644 --- a/net-dns/hash-slinger/metadata.xml +++ b/net-dns/hash-slinger/metadata.xml @@ -11,4 +11,7 @@ <flag name="openpgp">Enable support for OPENPGPKEY records (openpgpkey)</flag> <flag name="ssh">Enable support for SSHFP records (sshfp)</flag> </use> + <upstream> + <remote-id type="github">letoams/hash-slinger</remote-id> + </upstream> </pkgmetadata> diff --git a/net-dns/inadyn/Manifest b/net-dns/inadyn/Manifest new file mode 100644 index 000000000000..4ae2f68a5003 --- /dev/null +++ b/net-dns/inadyn/Manifest @@ -0,0 +1,2 @@ +DIST inadyn-2.12.0.tar.gz 506723 BLAKE2B 35fc5f8f9298cfb5ff7bf4c569fbd0495c2591a1fd630919bae8dabff03a0e41c512d304d2519be688bff3c41427f13b0a66738b785e1d28e0ec4d3901f05488 SHA512 940e49cd2c434f57a56494e1946939f0d773deeb489939c957c0e1eac135177ab3c446e967daa01a56fde5490568761c1492646bae1bb2f63688e0e9121ef8fe +DIST inadyn-2.12.0.tar.xz 341904 BLAKE2B 2bb1e8f16784c41cb2810c3ed2a52ef12823277082b33a9436a330caad4b4f76034ab3e7f9fefb4dffc0fbf5968f4fb60967f784ce3682f165666c8c0744fcc9 SHA512 309ad6deca4831cbbfb4f4c0b4fcc1ba69fd46a47dc329b20b5e74acdcaf32e7bef435abdc89d2924b576d166095b61bdb7a74cc698a805659c47e7d6a4fe907 diff --git a/net-dns/inadyn/files/inadyn.confd b/net-dns/inadyn/files/inadyn.confd new file mode 100644 index 000000000000..89c550d5f48d --- /dev/null +++ b/net-dns/inadyn/files/inadyn.confd @@ -0,0 +1,5 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Additional passed opts for In-a-Dyn +INADYN_OPTS="" diff --git a/net-dns/inadyn/files/inadyn.initd b/net-dns/inadyn/files/inadyn.initd new file mode 100644 index 000000000000..9b93663fd80c --- /dev/null +++ b/net-dns/inadyn/files/inadyn.initd @@ -0,0 +1,23 @@ +#!/sbin/openrc-run +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +config="/etc/inadyn.conf" +description="Dynamic DNS client" +name="In-a-Dyn" +pidfile="/run/inadyn/inadyn.pid" + +command="/usr/sbin/inadyn" +command_group="inadyn" +command_user="inadyn" +command_args="--drop-privs=${command_user}:${command_group} --pidfile=${pidfile} ${INADYN_OPTS}" + +start_pre() { + if [ ! -f "${config}" ]; then + eerror "Please create ${config} before starting In-a-Dyn!" + return 1 + else + checkpath -f -m 600 -o "${command_user}:${command_group}" -q "${config}" + return 0 + fi +} diff --git a/net-dns/inadyn/files/inadyn.tmpfilesd b/net-dns/inadyn/files/inadyn.tmpfilesd new file mode 100644 index 000000000000..702ca17ae3b4 --- /dev/null +++ b/net-dns/inadyn/files/inadyn.tmpfilesd @@ -0,0 +1,2 @@ +# inadyn runtime directory for pid file +d /run/inadyn 0755 inadyn inadyn - diff --git a/net-dns/inadyn/inadyn-2.12.0-r1.ebuild b/net-dns/inadyn/inadyn-2.12.0-r1.ebuild new file mode 100644 index 000000000000..d95e11c356fd --- /dev/null +++ b/net-dns/inadyn/inadyn-2.12.0-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd tmpfiles + +DESCRIPTION="Dynamic DNS client with multiple SSL/TLS library support" +HOMEPAGE="https://github.com/troglobit/inadyn" +SRC_URI="https://github.com/troglobit/inadyn/releases/download/v${PV}/${P}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="gnutls mbedtls openssl" +REQUIRED_USE="?? ( gnutls mbedtls openssl )" + +DEPEND=" + acct-group/inadyn + acct-user/inadyn + dev-libs/confuse:= + gnutls? ( + dev-libs/nettle:= + net-libs/gnutls:= + ) + mbedtls? ( net-libs/mbedtls:= ) + openssl? ( dev-libs/openssl:= ) +" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +src_configure() { + # Tests would need a custom config file in homedir per configure help? + local myeconfargs=( + --disable-ssl + --with-systemd="$(systemd_get_systemunitdir)" + ) + + if use gnutls || use mbedtls || use openssl; then + myeconfargs=( --enable-ssl ) + fi + + if use mbedtls; then + myeconfargs+=( --enable-mbedtls ) + + # MbedTLS has no support for pkg-config + # TODO: Revisit a while after bug #922123 is fixed + myeconfargs+=( MbedTLS_CFLAGS="-I${ESYSROOT}/usr/include/mbedtls" ) + myeconfargs+=( MbedTLS_LIBS="-lmbedtls" ) + fi + + use openssl && myeconfargs+=( --enable-openssl ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + insinto /etc + insopts -m 0600 -o inadyn -g inadyn + doins examples/inadyn.conf + + newinitd "${FILESDIR}"/inadyn.initd inadyn + newconfd "${FILESDIR}"/inadyn.confd inadyn + + newtmpfiles "${FILESDIR}"/inadyn.tmpfilesd inadyn.conf +} + +pkg_postinst() { + tmpfiles_process inadyn.conf +} diff --git a/net-dns/inadyn/inadyn-2.12.0.ebuild b/net-dns/inadyn/inadyn-2.12.0.ebuild new file mode 100644 index 000000000000..14ccc44e5337 --- /dev/null +++ b/net-dns/inadyn/inadyn-2.12.0.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd tmpfiles + +DESCRIPTION="Dynamic DNS client with multiple SSL/TLS library support" +HOMEPAGE="https://github.com/troglobit/inadyn" +SRC_URI="https://github.com/troglobit/inadyn/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="gnutls mbedtls openssl" +REQUIRED_USE="?? ( gnutls mbedtls openssl )" + +DEPEND=" + acct-group/inadyn + acct-user/inadyn + dev-libs/confuse:= + gnutls? ( + dev-libs/nettle:= + net-libs/gnutls:0= + ) + mbedtls? ( net-libs/mbedtls:0= ) + openssl? ( dev-libs/openssl:0= ) +" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +src_configure() { + local myeconfargs=( "--disable-ssl" ) + if use gnutls || use mbedtls || use openssl; then + local myeconfargs=( "--enable-ssl" ) + fi + + if use mbedtls; then + myeconfargs+=( "--enable-mbedtls" ) + + # MbedTLS has no support for pkg-config + myeconfargs+=( MbedTLS_CFLAGS="-I/usr/include/mbedtls" ) + myeconfargs+=( MbedTLS_LIBS="-lmbedtls" ) + fi + use openssl && myeconfargs+=( "--enable-openssl" ) + + myeconfargs+=( --with-systemd="$(systemd_get_systemunitdir)" ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + insinto /etc + insopts -m 0600 -o inadyn -g inadyn + doins examples/inadyn.conf + + newinitd "${FILESDIR}"/inadyn.initd inadyn + newconfd "${FILESDIR}"/inadyn.confd inadyn + + newtmpfiles "${FILESDIR}"/inadyn.tmpfilesd inadyn.conf +} + +pkg_postinst() { + tmpfiles_process inadyn.conf +} diff --git a/net-dns/inadyn/metadata.xml b/net-dns/inadyn/metadata.xml new file mode 100644 index 000000000000..e1ffc52abaa4 --- /dev/null +++ b/net-dns/inadyn/metadata.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <longdescription> + Inadyn, or In-a-Dyn, is a small and simple Dynamic DNS, + DDNS, client with HTTPS support. Commonly available in + many GNU/Linux distributions, used in off the shelf routers + and Internet gateways to automate the task of keeping your + Internet name in sync with your public IP address. + It can also be used in installations with redundant (backup) + connections to the Internet. + </longdescription> + <use> + <flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> as tls provider.</flag> + <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> as tls provider.</flag> + </use> + <upstream> + <bugs-to>https://github.com/troglobit/inadyn/issues</bugs-to> + <remote-id type="github">troglobit/inadyn</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest new file mode 100644 index 000000000000..e689e1deb0f5 --- /dev/null +++ b/net-dns/knot-resolver/Manifest @@ -0,0 +1,4 @@ +DIST knot-resolver-5.7.1.tar.xz 1928088 BLAKE2B 66a7f4e5e16a07f4ef2ed7ec42e40068dc9642362deffb2f78a1aa14e7cffe7e170ebde4180d460b9d5701632258e9e2148b34f5967200651762c2e8b5fe371a SHA512 89ebff7e239ea09d9d180386f4551952fb59a3f1d0ca01a172acf27d2eade16ae578142d811333e49ad3a2f629cf5b23d038043c0768469078fcfd5cbfb5020b +DIST knot-resolver-5.7.1.tar.xz.asc 833 BLAKE2B 058a040d23a7e55dc9faf7b02967f9e5d9582f2fdbed9b8737843d0e734a1dd1bc7503e367904664fc5f42f79f1839c43aaf1c00a3fbce50c1a7d2ddf7c515cc SHA512 0ec86e0aba583383df4f1ed909ef71a3473bc1412970b91d184372b53c5471ac41e6bf60e9a817c184501113f2d8272c3b0d2c379f80dfe2476ef32c861dd235 +DIST knot-resolver-5.7.2.tar.xz 1928336 BLAKE2B c4f17a050752a5d1ed141bae646f53f313e866b91b80bb72d37c6b2907d365333ca02fbadf4ff49e5559b721b695d1e7af3417a25e0518dbdfdec1860f890408 SHA512 973e9a541b54cee0d230247d279785a83ce2127216b12ee9f314a49adedac3e23e8369900d6f0985b0a666e9bcae7772f29224565e6208ed4988b13530e4ff0b +DIST knot-resolver-5.7.2.tar.xz.asc 833 BLAKE2B f73f52d7b2326a58a37b821cd8495d20c93017bd1f7bad2cc828f807f1886fc376dc95405b3b36047719f8566e27d7c1052b7ab11fae3d1d67c5563a293d965e SHA512 cf05ceca455400004cf249b1029b93619a1d5fcf839bca1259a7b411a1ddef1da0aff187ea0023c587de1981e91a8d26af3bb22341cf426e5055e8ca1c4024e2 diff --git a/net-dns/knot-resolver/files/knot-resolver-5.5.3-docdir.patch b/net-dns/knot-resolver/files/knot-resolver-5.5.3-docdir.patch new file mode 100644 index 000000000000..d75b98c3acca --- /dev/null +++ b/net-dns/knot-resolver/files/knot-resolver-5.5.3-docdir.patch @@ -0,0 +1,32 @@ +From 4086abfd85e0bacc027ac1773d524093387265f9 Mon Sep 17 00:00:00 2001 +From: Matthew Smith <matthew@gentoo.org> +Date: Sun, 16 Oct 2022 13:49:25 +0100 +Subject: [PATCH] build: docdir option + +--- a/meson.build ++++ b/meson.build +@@ -46,7 +46,7 @@ endif + ## Paths + prefix = get_option('prefix') + data_dir = prefix / get_option('datadir') / 'knot-resolver' +-doc_dir = prefix / get_option('datadir') / 'doc' / 'knot-resolver' ++doc_dir = get_option('docdir') + info_dir = prefix / get_option('datadir') / 'info' + examples_dir = doc_dir / 'examples' + etc_dir = prefix / get_option('sysconfdir') / 'knot-resolver' +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,6 +1,13 @@ + # Configuration options + # SPDX-License-Identifier: GPL-3.0-or-later + ++option( ++ 'docdir', ++ type: 'string', ++ value: '/usr/share/doc/knot-resolver', ++ description: 'path to store documentation', ++) ++ + option( + 'keyfile_default', + type: 'string', diff --git a/net-dns/knot-resolver/files/knot-resolver-5.5.3-nghttp-openssl.patch b/net-dns/knot-resolver/files/knot-resolver-5.5.3-nghttp-openssl.patch new file mode 100644 index 000000000000..49340be1506c --- /dev/null +++ b/net-dns/knot-resolver/files/knot-resolver-5.5.3-nghttp-openssl.patch @@ -0,0 +1,38 @@ +From 30087f85bb8d19586350c2a64648c0578c5c096c Mon Sep 17 00:00:00 2001 +From: Matthew Smith <matthew@gentoo.org> +Date: Sun, 16 Oct 2022 13:44:40 +0100 +Subject: [PATCH] build: Add nghttp2 and openssl options + +--- a/meson.build ++++ b/meson.build +@@ -87,8 +87,8 @@ group = get_option('group') + + ## Optional dependencies + message('--- optional dependencies ---') +-nghttp2 = dependency('libnghttp2', required: false) +-openssl = dependency('openssl', required: false) ++nghttp2 = dependency('libnghttp2', required: get_option('nghttp2')) ++openssl = dependency('openssl', required: get_option('openssl')) + + have_asprintf = meson.get_compiler('c').has_function('asprintf', + prefix: '#define _GNU_SOURCE\n#include <stdio.h>') +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -205,3 +205,17 @@ option( + value: 'auto', + description: 'cmocka unit tests', + ) ++ ++option( ++ 'nghttp2', ++ type: 'feature', ++ value: 'auto', ++ description: 'dns over https support', ++) ++ ++option( ++ 'openssl', ++ type: 'feature', ++ value: 'auto', ++ description: 'auxiliary debug library for http module', ++) diff --git a/net-dns/knot-resolver/files/knot-resolver-5.7.0-r2-tmpfiles.patch b/net-dns/knot-resolver/files/knot-resolver-5.7.0-r2-tmpfiles.patch new file mode 100644 index 000000000000..a909a6e8c89b --- /dev/null +++ b/net-dns/knot-resolver/files/knot-resolver-5.7.0-r2-tmpfiles.patch @@ -0,0 +1,60 @@ +Always install tmpfiles config. + +Bug: https://bugs.gentoo.org/921567 +Bug: https://gitlab.nic.cz/knot/knot-resolver/-/issues/886 +--- a/meson.build ++++ b/meson.build +@@ -237,9 +237,7 @@ subdir('etc') + + + # Systemd unit files +-if systemd_files != 'disabled' +- subdir('systemd') +-endif ++subdir('systemd') + + + # Additional files +--- a/systemd/meson.build ++++ b/systemd/meson.build +@@ -12,6 +12,18 @@ systemd_config.set('etc_dir', etc_dir) + systemd_config.set('run_dir', run_dir) + systemd_config.set('lib_dir', lib_dir) + ++## tmpfiles ++tmpfiles = configure_file( ++ input: 'tmpfiles.d/knot-resolver.conf.in', ++ output: 'knot-resolver.tmpfiles', ++ configuration: systemd_config, ++) ++install_data( ++ tmpfiles, ++ rename: ['knot-resolver.conf'], ++ install_dir: systemd_tmpfiles_dir, ++) ++ + if systemd_files == 'enabled' + ## unit files + kresd_service = configure_file( +@@ -39,18 +51,6 @@ if systemd_files == 'enabled' + ) + install_man(kresd_systemd_man) + +- ## tmpfiles +- tmpfiles = configure_file( +- input: 'tmpfiles.d/knot-resolver.conf.in', +- output: 'knot-resolver.tmpfiles', +- configuration: systemd_config, +- ) +- install_data( +- tmpfiles, +- rename: ['knot-resolver.conf'], +- install_dir: systemd_tmpfiles_dir, +- ) +- + ## sysusers + sysusers = configure_file( + input: 'sysusers.d/knot-resolver.conf.in', +-- +2.43.0 + diff --git a/net-dns/knot-resolver/files/kresd.confd-r1 b/net-dns/knot-resolver/files/kresd.confd-r1 new file mode 100644 index 000000000000..2b67587c646a --- /dev/null +++ b/net-dns/knot-resolver/files/kresd.confd-r1 @@ -0,0 +1,9 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +#KRESD_USER=knot-resolver +#KRESD_GROUP=knot-resolver +#KRESD_CONFIG="/etc/knot-resolver/kresd.conf" +#KRESD_RUNDIR="/var/run/kresd" +#KRESD_PIDFILE="/var/run/kresd.pid" +KRESD_OPTS=""
\ No newline at end of file diff --git a/net-dns/knot-resolver/files/kresd.initd-r1 b/net-dns/knot-resolver/files/kresd.initd-r1 new file mode 100644 index 000000000000..9732b48cc2cb --- /dev/null +++ b/net-dns/knot-resolver/files/kresd.initd-r1 @@ -0,0 +1,31 @@ +#!/sbin/openrc-run +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +: ${KRESD_GROUP:=knot-resolver} +: ${KRESD_USER:=knot-resolver} +: ${KRESD_CONFIG:=/etc/knot-resolver/kresd.conf} +: ${KRESD_RUNDIR:=/var/run/kresd} +: ${KRESD_PIDFILE:=/var/run/kresd.pid} + +command="/usr/sbin/kresd" +command_args="${KRESD_OPTS} -n -c ${KRESD_CONFIG} ${KRESD_RUNDIR}" +command_user="${KRESD_USER}:${KRESD_GROUP}" +pidfile="${KRESD_PIDFILE}" +command_background=true +retry="TERM/60/KILL/5" + +capabilities="^cap_net_bind_service,^cap_setpcap" + +name="knot-resolver" +description="scaleable caching DNS resolver" + +depend() { + need net + use logger + provide dns +} + +start_pre() { + checkpath -d -m 0750 -o "${KRESD_USER}:${KRESD_GROUP}" ${KRESD_RUNDIR} +} diff --git a/net-dns/knot-resolver/knot-resolver-5.7.1.ebuild b/net-dns/knot-resolver/knot-resolver-5.7.1.ebuild new file mode 100644 index 000000000000..a30c19804140 --- /dev/null +++ b/net-dns/knot-resolver/knot-resolver-5.7.1.ebuild @@ -0,0 +1,101 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( luajit ) + +inherit lua-single meson tmpfiles verify-sig + +DESCRIPTION="A scaleable caching DNS resolver" +HOMEPAGE="https://www.knot-resolver.cz https://gitlab.nic.cz/knot/knot-resolver" +SRC_URI=" + https://secure.nic.cz/files/${PN}/${P}.tar.xz + verify-sig? ( https://secure.nic.cz/files/${PN}/${P}.tar.xz.asc ) +" + +LICENSE="Apache-2.0 BSD CC0-1.0 GPL-3+ LGPL-2.1+ MIT" +SLOT="0" +KEYWORDS="amd64" +IUSE="caps dnstap jemalloc kresc nghttp2 systemd test" +RESTRICT="!test? ( test )" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND=" + ${LUA_DEPS} + acct-group/knot-resolver + acct-user/knot-resolver + dev-db/lmdb:= + dev-libs/libuv:= + net-dns/knot:= + net-libs/gnutls:= + caps? ( sys-libs/libcap-ng ) + dnstap? ( + dev-libs/fstrm + dev-libs/protobuf-c:= + ) + jemalloc? ( dev-libs/jemalloc:= ) + kresc? ( dev-libs/libedit ) + nghttp2? ( net-libs/nghttp2:= ) + systemd? ( sys-apps/systemd:= ) +" +DEPEND=" + ${RDEPEND} + test? ( + dev-util/cmocka + ) +" +BDEPEND=" + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-knot-resolver ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-5.5.3-docdir.patch + "${FILESDIR}"/${PN}-5.5.3-nghttp-openssl.patch + + # Bug #921567 + "${FILESDIR}"/${PN}-5.7.0-r2-tmpfiles.patch +) + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/${PN}.gpg + +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc} + fi + + unpack ${P}.tar.xz +} + +src_configure() { + local emesonargs=( + --localstatedir "${EPREFIX}"/var # double lib + # https://bugs.gentoo.org/870019 + -Dauto_features=disabled + -Ddoc=disabled + -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} + -Dopenssl=disabled + -Dmalloc=$(usex jemalloc jemalloc disabled) + $(meson_feature caps capng) + $(meson_feature dnstap) + $(meson_feature kresc client) + $(meson_feature nghttp2) + $(meson_feature test unit_tests) + $(meson_feature systemd systemd_files) + ) + + meson_src_configure +} + +src_install() { + meson_src_install + fowners -R ${PN}: /etc/${PN} + + newinitd "${FILESDIR}"/kresd.initd-r1 kresd + newconfd "${FILESDIR}"/kresd.confd-r1 kresd +} + +pkg_postinst() { + tmpfiles_process knot-resolver.conf +} diff --git a/net-dns/knot-resolver/knot-resolver-5.7.2.ebuild b/net-dns/knot-resolver/knot-resolver-5.7.2.ebuild new file mode 100644 index 000000000000..9877746f6cda --- /dev/null +++ b/net-dns/knot-resolver/knot-resolver-5.7.2.ebuild @@ -0,0 +1,101 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( luajit ) + +inherit lua-single meson tmpfiles verify-sig + +DESCRIPTION="A scaleable caching DNS resolver" +HOMEPAGE="https://www.knot-resolver.cz https://gitlab.nic.cz/knot/knot-resolver" +SRC_URI=" + https://secure.nic.cz/files/${PN}/${P}.tar.xz + verify-sig? ( https://secure.nic.cz/files/${PN}/${P}.tar.xz.asc ) +" + +LICENSE="Apache-2.0 BSD CC0-1.0 GPL-3+ LGPL-2.1+ MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="caps dnstap jemalloc kresc nghttp2 systemd test" +RESTRICT="!test? ( test )" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND=" + ${LUA_DEPS} + acct-group/knot-resolver + acct-user/knot-resolver + dev-db/lmdb:= + dev-libs/libuv:= + net-dns/knot:= + net-libs/gnutls:= + caps? ( sys-libs/libcap-ng ) + dnstap? ( + dev-libs/fstrm + dev-libs/protobuf-c:= + ) + jemalloc? ( dev-libs/jemalloc:= ) + kresc? ( dev-libs/libedit ) + nghttp2? ( net-libs/nghttp2:= ) + systemd? ( sys-apps/systemd:= ) +" +DEPEND=" + ${RDEPEND} + test? ( + dev-util/cmocka + ) +" +BDEPEND=" + virtual/pkgconfig + verify-sig? ( >=sec-keys/openpgp-keys-knot-resolver-20240304 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-5.5.3-docdir.patch + "${FILESDIR}"/${PN}-5.5.3-nghttp-openssl.patch + + # Bug #921567 + "${FILESDIR}"/${PN}-5.7.0-r2-tmpfiles.patch +) + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/${PN}.gpg + +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.asc} + fi + + unpack ${P}.tar.xz +} + +src_configure() { + local emesonargs=( + --localstatedir "${EPREFIX}"/var # double lib + # https://bugs.gentoo.org/870019 + -Dauto_features=disabled + -Ddoc=disabled + -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} + -Dopenssl=disabled + -Dmalloc=$(usex jemalloc jemalloc disabled) + $(meson_feature caps capng) + $(meson_feature dnstap) + $(meson_feature kresc client) + $(meson_feature nghttp2) + $(meson_feature test unit_tests) + $(meson_feature systemd systemd_files) + ) + + meson_src_configure +} + +src_install() { + meson_src_install + fowners -R ${PN}: /etc/${PN} + + newinitd "${FILESDIR}"/kresd.initd-r1 kresd + newconfd "${FILESDIR}"/kresd.confd-r1 kresd +} + +pkg_postinst() { + tmpfiles_process knot-resolver.conf +} diff --git a/net-dns/knot-resolver/metadata.xml b/net-dns/knot-resolver/metadata.xml new file mode 100644 index 000000000000..9f36a2c8cacc --- /dev/null +++ b/net-dns/knot-resolver/metadata.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>matthew@gentoo.org</email> + <name>Matthew Smith</name> + </maintainer> + <use> + <flag name="dnstap"> + Build dnstap binary logging module + </flag> + <flag name="kresc"> + Build (experimental) command-line client + </flag> + <flag name="nghttp2"> + DNS-over-HTTPS support + </flag> + </use> +</pkgmetadata> diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest index cb425aee192e..c52dee9cd1eb 100644 --- a/net-dns/knot/Manifest +++ b/net-dns/knot/Manifest @@ -1,3 +1,4 @@ DIST knot-3.1.5.tar.xz 1414500 BLAKE2B c05fcd9e99d4c7dba03ad9fd9a1131ca4c2556d4911640ef929e68d4caea26ae69ddc61fa19f8c3c4f29efcd0c4c2e47593e86a0ac1826cc96c25f2fe4145bab SHA512 3a8cf04a2d65e04343a70009d43796ae00bf09e34348119b55ba70dac7deb7ff42906d88ef0e413d33dec28a952396a51781dee96727c0c2047b4c5ade54e6fa -DIST knot-3.1.7.tar.xz 1418944 BLAKE2B d0e5c999c1b4bca89b86ad956dd91643f795fcba94757e34c44e3e6b925030c332da9cb0bfd72d6ae0f32b3016a8c50d821cfcc513268682dd6b5715714d9047 SHA512 4b6982e8b44addbc77f42d0a1c435dd257cc8a8f112677c371d16063ee8e769b646a6425d54ef338cd21555f276d8d6f4faad2da2f24bf92437ce4af9ff1fb44 -DIST knot-3.1.8.tar.xz 1439912 BLAKE2B bcc089d547a7cad8150e93d70da036273a60b0e740df9693bc38813c3d7ed1968b8f97ce4d32c2359ba509fdfcd8403e73eed1f0107d470e6cd4ba4e7012f96d SHA512 af72cbcc5b511dad148e7ce990819df00bdf99c110b44b3b521eddd8690a6ebd4c76c24e63d843956971d5f158bbfa851804616630d34f3a0ec06888c78ecf2c +DIST knot-3.1.9.tar.xz 1441408 BLAKE2B 383829107bef6b35cbef3c531bc91050e7742ca930bf6645c25cab04203ee360837808c3b5342089ce9ba9ee704290ab95b2f76172577d251c6a9c18796245a0 SHA512 e4ba1c006edcde2dc820e74c39df7a8b8983dfb2d8b8845ac759c6c67dfaabc5aae38282995ed92879a683665c0c179502858631c89ad53c2738f79df951eef7 +DIST knot-3.2.2.tar.xz 1632748 BLAKE2B 185567dc883f946570fe60cd7d01d96162c5f13ac84330e5551c293b5011c162401fd25ddbdb43bf9242e13c3cdc8225be107dc579619fe54c05335601cd27ae SHA512 29fadb96c1ea525c6183f9e7552f4ad370579b67d74aec1910a92d561cc2c5656fd7876015f29161d279a07c23643f6584308bf9fa0e74d351b17af54e5e9a7f +DIST knot-3.2.9.tar.xz 1642600 BLAKE2B 2c81b2afa96c6077778c3458b2ddeeb8b47ea99607ba755a904278f9755a32171738418ea442b1e6b4afcebe0db2c86e68845d38f8e78342b8354411d1e34af8 SHA512 baf8da222e38198c85fa62e45e71b29ddac7c90433b811710ace1e0395e6e7b5d63547ce8f3a62792ee11259ec2e36d6ddd8fff999416f9171671444a95086cf diff --git a/net-dns/knot/knot-3.1.5.ebuild b/net-dns/knot/knot-3.1.5.ebuild index 2e9df0831f3f..29970854cde7 100644 --- a/net-dns/knot/knot-3.1.5.ebuild +++ b/net-dns/knot/knot-3.1.5.ebuild @@ -6,10 +6,10 @@ EAPI=8 inherit flag-o-matic systemd DESCRIPTION="High-performance authoritative-only DNS server" -HOMEPAGE="https://www.knot-dns.cz/" +HOMEPAGE="https://www.knot-dns.cz/ https://gitlab.nic.cz/knot/knot-dns" SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz" -LICENSE="GPL-3" +LICENSE="GPL-3+" SLOT="0" KEYWORDS="amd64 ~riscv x86" diff --git a/net-dns/knot/knot-3.1.8.ebuild b/net-dns/knot/knot-3.1.9.ebuild index 77cbe56a39d2..c1c0a2de8e9b 100644 --- a/net-dns/knot/knot-3.1.8.ebuild +++ b/net-dns/knot/knot-3.1.9.ebuild @@ -6,10 +6,10 @@ EAPI=8 inherit flag-o-matic systemd DESCRIPTION="High-performance authoritative-only DNS server" -HOMEPAGE="https://www.knot-dns.cz/" +HOMEPAGE="https://www.knot-dns.cz/ https://gitlab.nic.cz/knot/knot-dns" SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz" -LICENSE="GPL-3" +LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64 ~riscv ~x86" diff --git a/net-dns/knot/knot-3.2.2.ebuild b/net-dns/knot/knot-3.2.2.ebuild new file mode 100644 index 000000000000..76430f146b00 --- /dev/null +++ b/net-dns/knot/knot-3.2.2.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic systemd + +# subslot: libknot major.libdnssec major.libzscanner major +KNOT_SUBSLOT="13.9.4" + +DESCRIPTION="High-performance authoritative-only DNS server" +HOMEPAGE="https://www.knot-dns.cz/ https://gitlab.nic.cz/knot/knot-dns" +SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz" + +LICENSE="GPL-3+" +SLOT="0/${KNOT_SUBSLOT}" +KEYWORDS="amd64 ~riscv x86" + +KNOT_MODULES=( + "+cookies" + "+dnsproxy" + "dnstap" + "geoip" + "+noudp" + "+onlinesign" + "+queryacl" + "+rrl" + "+stats" + "+synthrecord" + "+whoami" +) +IUSE="doc caps doh +fastparser idn +libidn2 quic systemd +utils xdp ${KNOT_MODULES[@]}" + +RDEPEND=" + acct-group/knot + acct-user/knot + dev-db/lmdb:= + dev-libs/libedit + dev-libs/userspace-rcu:= + dev-python/lmdb:= + net-libs/gnutls:= + caps? ( sys-libs/libcap-ng ) + dnstap? ( + dev-libs/fstrm + dev-libs/protobuf-c:= + ) + doh? ( net-libs/nghttp2:= ) + geoip? ( dev-libs/libmaxminddb:= ) + idn? ( + !libidn2? ( net-dns/libidn:0= !net-dns/libidn2 ) + libidn2? ( net-dns/libidn2:= ) + ) + quic? ( net-libs/ngtcp2:=[gnutls] ) + systemd? ( sys-apps/systemd:= ) + xdp? ( + dev-libs/libbpf:= + net-libs/libmnl:= + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( dev-python/sphinx ) +" + +S="${WORKDIR}/${P/_/-}" + +src_configure() { + local u + local my_conf=( + --with-storage="${EPREFIX}/var/lib/${PN}" + --with-rundir="${EPREFIX}/var/run/${PN}" + $(use_enable caps cap_ng) + $(use_enable fastparser) + $(use_enable dnstap) + $(use_enable doc documentation) + $(use_enable quic) + $(use_enable utils utilities) + $(use_enable xdp) + --enable-systemd=$(usex systemd) + $(use_with idn libidn) + $(use_with doh libnghttp2) + ) + + for u in "${KNOT_MODULES[@]#+}"; do + my_conf+=("$(use_with ${u} module-${u})") + done + + if use riscv; then + append-libs -latomic + fi + + econf "${my_conf[@]}" +} + +src_compile() { + default + + use doc && emake -C doc html +} + +src_test() { + emake check +} + +src_install() { + use doc && local HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} ) + + default + + rmdir "${D}/var/run/${PN}" "${D}/var/run/" || die + + newinitd "${FILESDIR}/knot.init" knot + if use systemd; then + systemd_newunit "${FILESDIR}/knot-1.service" knot.service + fi + + find "${D}" -name '*.la' -delete || die + + keepdir /var/lib/knot +} diff --git a/net-dns/knot/knot-3.1.7.ebuild b/net-dns/knot/knot-3.2.9.ebuild index 307ad4216af5..b668939ce738 100644 --- a/net-dns/knot/knot-3.1.7.ebuild +++ b/net-dns/knot/knot-3.2.9.ebuild @@ -1,16 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit flag-o-matic systemd +# subslot: libknot major.libdnssec major.libzscanner major +KNOT_SUBSLOT="13.9.4" + DESCRIPTION="High-performance authoritative-only DNS server" -HOMEPAGE="https://www.knot-dns.cz/" +HOMEPAGE="https://www.knot-dns.cz/ https://gitlab.nic.cz/knot/knot-dns" SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz" -LICENSE="GPL-3" -SLOT="0" +LICENSE="GPL-3+" +SLOT="0/${KNOT_SUBSLOT}" KEYWORDS="~amd64 ~riscv ~x86" KNOT_MODULES=( @@ -26,12 +29,12 @@ KNOT_MODULES=( "+synthrecord" "+whoami" ) -IUSE="doc caps doh +fastparser idn +libidn2 systemd +utils xdp ${KNOT_MODULES[@]}" +IUSE="doc caps doh +fastparser idn +libidn2 quic systemd +utils xdp ${KNOT_MODULES[@]}" RDEPEND=" acct-group/knot acct-user/knot - dev-db/lmdb + dev-db/lmdb:= dev-libs/libedit dev-libs/userspace-rcu:= dev-python/lmdb:= @@ -47,6 +50,7 @@ RDEPEND=" !libidn2? ( net-dns/libidn:0= !net-dns/libidn2 ) libidn2? ( net-dns/libidn2:= ) ) + quic? ( >=net-libs/ngtcp2-0.13.1:=[gnutls] ) systemd? ( sys-apps/systemd:= ) xdp? ( dev-libs/libbpf:= @@ -66,9 +70,11 @@ src_configure() { local my_conf=( --with-storage="${EPREFIX}/var/lib/${PN}" --with-rundir="${EPREFIX}/var/run/${PN}" + $(use_enable caps cap_ng) $(use_enable fastparser) $(use_enable dnstap) $(use_enable doc documentation) + $(use_enable quic) $(use_enable utils utilities) $(use_enable xdp) --enable-systemd=$(usex systemd) diff --git a/net-dns/knot/metadata.xml b/net-dns/knot/metadata.xml index 8c39b17e75fa..d7aafeb4ba1e 100644 --- a/net-dns/knot/metadata.xml +++ b/net-dns/knot/metadata.xml @@ -31,8 +31,8 @@ Enable the Geography-based responses module </flag> <flag name="libidn2"> - If IDN support is enabled, use net-dns/libidn2 instead - of net-dns/libidn + If IDN support is enabled, use <pkg>net-dns/libidn2</pkg> instead + of <pkg>net-dns/libidn</pkg> </flag> <flag name="noudp"> Enable the module which can send empty truncated @@ -45,6 +45,9 @@ <flag name="queryacl"> Enable the module for query access control </flag> + <flag name="quic"> + Enable the DNS over QUIC (DoQ) module using libngtcp2 + </flag> <flag name="rrl"> Enable the response rate limiting module </flag> @@ -64,4 +67,12 @@ Enable eXpress Data Path </flag> </use> + <slots> + <subslots> + Reflect sonames of libknot, libdnssec, and libzscanner. + </subslots> + </slots> + <upstream> + <remote-id type="github">CZ-NIC/knot</remote-id> + </upstream> </pkgmetadata> diff --git a/net-dns/ldns-utils/ldns-utils-1.8.0-r3.ebuild b/net-dns/ldns-utils/ldns-utils-1.8.0-r3.ebuild deleted file mode 100644 index 3f59da4cf82d..000000000000 --- a/net-dns/ldns-utils/ldns-utils-1.8.0-r3.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_P=${P/-utils} - -DESCRIPTION="Set of utilities to simplify various dns(sec) tasks" -HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" - -RDEPEND=">=net-libs/ldns-1.8.0-r3" diff --git a/net-dns/ldns-utils/metadata.xml b/net-dns/ldns-utils/metadata.xml deleted file mode 100644 index 0fdb9aa842a6..000000000000 --- a/net-dns/ldns-utils/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>mschiff@gentoo.org</email> - <name>Marc Schiffbauer</name> - </maintainer> - <longdescription lang="en"> - ldns is a library with the aim to simplify DNS programing in C. All - lowlevel DNS/DNSSEC operations are supported. We also define a higher - level API which allows a programmer to (for instance) create or sign - packets. - </longdescription> -</pkgmetadata> diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest index 982af456c312..70b5ac66d03a 100644 --- a/net-dns/libidn/Manifest +++ b/net-dns/libidn/Manifest @@ -1,2 +1,2 @@ -DIST libidn-1.38.tar.gz 2681263 BLAKE2B 92059e87554338a3565ee4b517fa1ba7bd3e9d57d8be7d71aee377220f50b597e529469c6ddc7c9e7c25b9e83c76f652457256dd32249c3e1cd97df8867723a1 SHA512 5e59b2263fde44d1463b47b516347b17a4e3e3696ebba66ab5fe464d567e2ec81f769fa7cf72ed51cfb501e32221813bb375373713a47e2f599fc6122850e419 -DIST libidn-1.38.tar.gz.sig 488 BLAKE2B 3a5a5f3d79f2f01019d71e2b20b7daf264c71ed21ec922733c03ed42e0acd0bb6c2758ca7095b7fc52025d01c784eb539e53408ae663ac2bcdcc8e92ba11f342 SHA512 9caf0f9633f607861e94d6efe30383181db67e6fb437903b6c1ff1758363824afc1b01458f845d2bf11c8f2ec01708ba98da54a43a6e2429978caa0f41166ffe +DIST libidn-1.42.tar.gz 2653078 BLAKE2B 8f16d388884ad2ac9aafc46ec5eae144508ca86135184f625761c82c02ec9f99400bd4db65c9c9df54d315502cd5e2d37893d171abc6d76abe0a70f29acdb68e SHA512 1a99f0c9aa12cebed2de7db603c203696544cfe093afd7b233b0955f4fbe65440bf637089a624ed74e204abe854b1d16d11b77dc1b8d56c97ba6b20715aeb0d7 +DIST libidn-1.42.tar.gz.sig 228 BLAKE2B 0f2eab508a88de3ce03d79fa10fa053c5e24d76414c1f7f8f3cbaf956a818ec155407affce13cc588bc3838a3c85ef6f99ea30a3d18aa3553e2a1a92cf4282c2 SHA512 16706a3570620badf05ad146c8bf6ff7e96dc066b9dd609c22ecf3f942e70fa615f0f479e6d06b3317ddc094192f76effb841cbe72bff276914821f177ef2049 diff --git a/net-dns/libidn/libidn-1.38-r1.ebuild b/net-dns/libidn/libidn-1.38-r1.ebuild deleted file mode 100644 index 0325c81c8f2d..000000000000 --- a/net-dns/libidn/libidn-1.38-r1.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libidn.asc -inherit elisp-common java-pkg-opt-2 libtool mono-env multilib-minimal verify-sig - -DESCRIPTION="Internationalized Domain Names (IDN) implementation" -HOMEPAGE="https://www.gnu.org/software/libidn/" -SRC_URI="mirror://gnu/libidn/${P}.tar.gz - verify-sig? ( mirror://gnu/libidn/${P}.tar.gz.sig )" - -LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )" -SLOT="0/12" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc emacs java mono nls" - -DEPEND="mono? ( >=dev-lang/mono-0.95 ) - nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" -RDEPEND="java? ( >=virtual/jre-1.8:* )" -BDEPEND="emacs? ( >=app-editors/emacs-23.1:* ) - java? ( >=virtual/jdk-1.8:* ) - nls? ( >=sys-devel/gettext-0.17 ) - verify-sig? ( sec-keys/openpgp-keys-libidn )" - -DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS ) - -pkg_setup() { - use mono && mono-env_pkg_setup - - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - default - - # Bundled and with wrong bytecode - rm "${S}/java/${P}.jar" || die - - # For Solaris shared objects - elibtoolize -} - -multilib_src_configure() { - local -x GJDOC=javadoc - - local args=( - $(multilib_native_use_enable java) - $(multilib_native_use_enable mono csharp mono) - $(use_enable nls) - --disable-static - --disable-valgrind-tests - --with-lispdir="${EPREFIX}${SITELISP}/${PN}" - --with-packager-bug-reports="https://bugs.gentoo.org" - --with-packager-version="r${PR}" - --with-packager="Gentoo Linux" - ) - - ECONF_SOURCE="${S}" econf "${args[@]}" -} - -multilib_src_compile() { - default - - if multilib_is_native_abi; then - use emacs && elisp-compile "${S}"/src/*.el - use java && use doc && emake -C java/src/main/java javadoc - fi -} - -multilib_src_test() { - # Only run libidn specific tests and not gnulib tests (bug #539356) - emake -C tests check -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - if multilib_is_native_abi && use java; then - java-pkg_newjar java/${P}.jar ${PN}.jar - - rm -r "${ED}"/usr/share/java || die - - use doc && java-pkg_dojavadoc "${S}"/doc/java - fi -} - -multilib_src_install_all() { - if use emacs; then - # *.el are installed by the build system - elisp-install ${PN} "${S}"/src/*.elc - elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el - else - rm -r "${ED}"/usr/share/emacs || die - fi - - einstalldocs - - use doc && dodoc -r doc/reference/html - - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/net-dns/libidn/libidn-1.42.ebuild b/net-dns/libidn/libidn-1.42.ebuild new file mode 100644 index 000000000000..5f34de9c16c2 --- /dev/null +++ b/net-dns/libidn/libidn-1.42.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libidn.asc +inherit elisp-common libtool multilib-minimal verify-sig + +DESCRIPTION="Internationalized Domain Names (IDN) implementation" +HOMEPAGE="https://www.gnu.org/software/libidn/" +SRC_URI=" + mirror://gnu/libidn/${P}.tar.gz + verify-sig? ( mirror://gnu/libidn/${P}.tar.gz.sig ) +" + +LICENSE="GPL-2 GPL-3 LGPL-3" +SLOT="0/12" +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="emacs nls" + +DEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" +RDEPEND="${DEPEND}" +BDEPEND=" + emacs? ( >=app-editors/emacs-23.1:* ) + nls? ( >=sys-devel/gettext-0.17 ) + verify-sig? ( >=sec-keys/openpgp-keys-libidn-20240114 ) +" + +DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS ) + +QA_CONFIG_IMPL_DECL_SKIP=( + unreachable + static_assert +) + +src_prepare() { + default + + # For Solaris shared objects + elibtoolize +} + +multilib_src_configure() { + # -fanalyzer substantially slows down the build and isn't useful for + # us. It's useful for upstream as it's static analysis, but it's not + # useful when just getting something built. + export gl_cv_warn_c__fanalyzer=no + + local args=( + $(use_enable nls) + --disable-gcc-warnings + --disable-doc + --disable-gtk-doc + --disable-gtk-doc-html + --disable-gtk-doc-pdf + --disable-csharp + --disable-java + --disable-valgrind-tests + --with-lispdir="${EPREFIX}${SITELISP}/${PN}" + --with-packager-bug-reports="https://bugs.gentoo.org" + --with-packager-version="r${PR}" + --with-packager="Gentoo Linux" + ) + + ECONF_SOURCE="${S}" econf "${args[@]}" +} + +multilib_src_compile() { + default + + if multilib_is_native_abi; then + use emacs && elisp-compile "${S}"/src/*.el + fi +} + +multilib_src_install_all() { + if use emacs; then + # *.el are installed by the build system + elisp-install ${PN} "${S}"/src/*.elc + elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el + else + rm -r "${ED}"/usr/share/emacs || die + fi + + einstalldocs + + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/net-dns/libidn/metadata.xml b/net-dns/libidn/metadata.xml index db33b23c0aa2..25d97209c0e1 100644 --- a/net-dns/libidn/metadata.xml +++ b/net-dns/libidn/metadata.xml @@ -9,4 +9,7 @@ <email>sam@gentoo.org</email> <name>Sam James</name> </maintainer> + <upstream> + <remote-id type="gitlab">libidn/libidn</remote-id> + </upstream> </pkgmetadata> diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest index 21d22503114b..89f9618ca4a9 100644 --- a/net-dns/libidn2/Manifest +++ b/net-dns/libidn2/Manifest @@ -1,2 +1,2 @@ -DIST libidn2-2.3.2.tar.gz 2169556 BLAKE2B 6914630ecf6dcf18eb808dae933b819ee705c73011e6ffd68f8d14dd2c2ed084a9b504385c29988b2c4b439c6c8f2f552e47f4d624ae20d8b64767bf4d47f6a3 SHA512 958dbf49a47a84c7627ac182f4cc8ea452696cec3f0d1ff102a6c48e89893e772b2aa81f75da8223dfc6326515cca3ae085268fbf997828de9330c3a351152f1 -DIST libidn2-2.3.2.tar.gz.sig 488 BLAKE2B 832a5424034147a2c969fdbe0e094c23cda6305fe6411728f7727054571f54f6f056b939cf13023606dcb4f4bd85ed527b8e85bce6e56ed366e893ea16f8eb13 SHA512 0559b51b37c7937f3e1f8bf9de9b193f137f16b79d6673f85691a4f4a12ec132568e913848a70136f8522118817f7ecaa8432d353a5eff6b99a7be8719421fe0 +DIST libidn2-2.3.7.tar.gz 2155214 BLAKE2B 40fde88e6be1e4665738855608a65c949834728463a3fb466192403f1076e99f7d399b9631308ff6776a28915251a0136ddfe6a67e8e010c7ccdb7fc64125d39 SHA512 eab5702bc0baed45492f8dde43a4d2ea3560ad80645e5f9e0cfa8d3b57bccd7fd782d04638e000ba07924a5d9f85e760095b55189188c4017b94705bef9b4a66 +DIST libidn2-2.3.7.tar.gz.sig 228 BLAKE2B 44f091a5a3ed7ad528ba404b4d1d1f60d1dae52e3c8173b633c30099e6e0405e51f46c954e4f5339b90d0fe883b5af34f8dbf704999e14aa4bd2f414a8473ad2 SHA512 00e5f8c3b6b1aef9ee341db99b339217080a57dbe65fba56798d60ad4be971a9535d8ae27e1f243b18b9fc9e900ada6c452b040a6c8094d5e05d8a76d1d79c03 diff --git a/net-dns/libidn2/libidn2-2.3.2.ebuild b/net-dns/libidn2/libidn2-2.3.2.ebuild deleted file mode 100644 index e27a6c7cf366..000000000000 --- a/net-dns/libidn2/libidn2-2.3.2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libidn.asc -inherit multilib-minimal toolchain-funcs verify-sig - -DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)" -HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/libidn/libidn2" -SRC_URI=" - mirror://gnu/libidn/${P}.tar.gz - verify-sig? ( mirror://gnu/libidn/${P}.tar.gz.sig ) -" -S="${WORKDIR}"/${P/a/} - -LICENSE="GPL-2+ LGPL-3+" -SLOT="0/2" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="static-libs" - -RDEPEND=" - dev-libs/libunistring:=[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-lang/perl - sys-apps/help2man - verify-sig? ( sec-keys/openpgp-keys-libidn ) -" - -src_prepare() { - default - - if [[ ${CHOST} == *-darwin* ]] ; then - # Darwin ar chokes when TMPDIR doesn't exist (as done for some - # reason in the Makefile) - sed -i -e '/^TMPDIR = /d' Makefile.in || die - export TMPDIR="${T}" - fi - - multilib_copy_sources -} - -multilib_src_configure() { - econf \ - CC_FOR_BUILD="$(tc-getBUILD_CC)" \ - $(use_enable static-libs static) \ - --disable-doc \ - --disable-gcc-warnings \ - --disable-gtk-doc -} - -multilib_src_install() { - default - - find "${ED}" -name '*.la' -delete || die -} diff --git a/net-dns/libidn2/libidn2-2.3.7.ebuild b/net-dns/libidn2/libidn2-2.3.7.ebuild new file mode 100644 index 000000000000..65de92ce8b66 --- /dev/null +++ b/net-dns/libidn2/libidn2-2.3.7.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-minimal toolchain-funcs verify-sig + +DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)" +HOMEPAGE=" + https://www.gnu.org/software/libidn/#libidn2 + https://gitlab.com/libidn/libidn2/ +" +SRC_URI=" + mirror://gnu/libidn/${P}.tar.gz + verify-sig? ( mirror://gnu/libidn/${P}.tar.gz.sig ) +" +S="${WORKDIR}"/${P/a/} + +LICENSE="|| ( GPL-2+ LGPL-3+ ) GPL-3+ unicode" +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="nls static-libs" + +RDEPEND=" + dev-libs/libunistring:=[${MULTILIB_USEDEP}] +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + dev-lang/perl + nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-libidn ) +" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libidn.asc + +multilib_src_configure() { + local myconf=( + CC_FOR_BUILD="$(tc-getBUILD_CC)" + $(use_enable static-libs static) + $(multilib_native_use_enable nls) + --enable-doc + --disable-gcc-warnings + --disable-gtk-doc + --disable-valgrind-tests + ) + + local ECONF_SOURCE=${S} + econf "${myconf[@]}" +} + +multilib_src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-dns/libidn2/metadata.xml b/net-dns/libidn2/metadata.xml index 6c92a6952cec..c2652ef897a9 100644 --- a/net-dns/libidn2/metadata.xml +++ b/net-dns/libidn2/metadata.xml @@ -15,5 +15,6 @@ </maintainer> <upstream> <remote-id type="cpe">cpe:/a:libidn2_project:libidn2</remote-id> + <remote-id type="gitlab">libidn/libidn2</remote-id> </upstream> </pkgmetadata> diff --git a/net-dns/maradns/Manifest b/net-dns/maradns/Manifest index 0483ddcd84fc..4c2bb6642f78 100644 --- a/net-dns/maradns/Manifest +++ b/net-dns/maradns/Manifest @@ -1,2 +1,2 @@ -DIST maradns-3.5.0005.tar.xz 5351412 BLAKE2B c6b1c4fb93cb507045b3c09574d7ce30b0af92301e157216b4a5bbd2ed74ceb829ef4d11cd08048c7a685a09cdd4178cf3fc4e7b2465820d26d3a5c1b96f4a5e SHA512 2e7008ff6217929008292dde60d96eb2ec0499a170e1b5bda5fcfb27300d2ce6cecd8b3e2a2d4b09ff32b803f9f435230378e6b2e41e7b63c42653d8c931151d -DIST maradns-3.5.0020.tar.xz 7154452 BLAKE2B 4d193c06620332b90f4a004e787f9cbe61cd48adcee1dd667ecf0383c0fb81f5b7cae40ee953f077b2ccf060d7429863f741cf942c34c862d6c56092bc40600b SHA512 3478ccdc82d5be45826072f91c1b00c491f21f69bcce169cfeb3dfdd00e0012a9def884d711daa41ea18dce52e069dbb4c31e1e37ecda418565b5d8d6a0ea4d4 +DIST maradns-3.5.0022.tar.xz 7375408 BLAKE2B d79fd800099f41e6395537b8a9d945820cd295c9a3be8bec0850b8c85df65a607b07c3a0949a6ed058d1155514836d5a72a3ab0512a4369a979b021c80159908 SHA512 0c4df5aac0a979a74f811c9ccd30e2708f6b21816d9d70b88bf31ac4a65175b46c3a53adf439e098c57aa9b79250c26a38c8cdf26e0ee52637092a184d852076 +DIST maradns-3.5.0036.tar.xz 9192932 BLAKE2B 43d2f84b937a176b794aff68fc4fe73b5aada96df27ebf16dde04be1b7883ff5a95a07b5ce37dc65b305979e1b4379d5b540e59f917bbf1518d4f909bab717a1 SHA512 0d8248ad858064aec162a1d4bbdcf48eca39e07403b243a318c6512e4fee57429c6aa216e434cb0cb6ae86182474ea9069dc8f69622e9eadb339cfa3a4dc554e diff --git a/net-dns/maradns/files/maradns-3.5.0005-flags.patch b/net-dns/maradns/files/maradns-3.5.0005-flags.patch deleted file mode 100644 index 66493632df0a..000000000000 --- a/net-dns/maradns/files/maradns-3.5.0005-flags.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/build/Makefile.linux -+++ b/build/Makefile.linux -@@ -24,13 +24,13 @@ EXECS=server/maradns - # end the Solaris section - # Non-Solaris version of "M" - V="VERSION=$(VERSION)" --Q="DEFINES=-DSELECT_PROBLEM" -+Q="$(LDFLAGS) DEFINES=-DSELECT_PROBLEM" - - # Debug - - FLAGS = -O2 -Wall -DSELECT_PROBLEM --M="CC=$(CC) $(FLAGS)" --D="CC=$(CC) $(FLAGS) -DDEBUG -DTHREADS" -+M="CC=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)" -+D="CC=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DDEBUG -DTHREADS" - #FLAGS = -g - - all: -@@ -39,7 +39,7 @@ all: - cd ../qual ; make $(M) ; cd ../server ; \ - make $(M) $(V) COMPILED=\"$(COMPILED)\" ; \ - cd ../tools ; make $(M) ; \ -- cd ../deadwood-*/src/ ; make FLAGS=-O2 ; \ -+ cd ../deadwood-*/src/ ; $(MAKE) $(M) ; \ - cd ../../tcp ; make $(M) $(V) ; cat ../00README.FIRST - - debug: diff --git a/net-dns/maradns/files/maradns-3.5.0020-flags-ipv6.patch b/net-dns/maradns/files/maradns-3.5.0020-flags-ipv6.patch deleted file mode 100644 index 4582dec4f56a..000000000000 --- a/net-dns/maradns/files/maradns-3.5.0020-flags-ipv6.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 0a2159798edffdbc0fdba67b2ae4aeca118a2516 Mon Sep 17 00:00:00 2001 -From: Victor Kustov <ktrace@yandex.ru> -Date: Mon, 31 May 2021 22:47:55 +0300 -Subject: [PATCH] fix - ---- - build/Makefile.linux | 52 ++++++++++++++++++++++---------------------- - configure | 4 ++-- - 2 files changed, 28 insertions(+), 28 deletions(-) - -diff --git a/build/Makefile.linux b/build/Makefile.linux -index 965c7fb..62c20b9 100644 ---- a/build/Makefile.linux -+++ b/build/Makefile.linux -@@ -24,48 +24,48 @@ EXECS=server/maradns - # end the Solaris section - # Non-Solaris version of "M" - V="VERSION=$(VERSION)" --Q="DEFINES=-DSELECT_PROBLEM" -+Q="$(LDFLAGS) DEFINES=-DSELECT_PROBLEM" - - # Debug - - FLAGS = -O2 -Wall -DSELECT_PROBLEM --M="CC=$(CC) $(FLAGS)" --D="CC=$(CC) $(FLAGS) -DDEBUG -DTHREADS" -+M="CC=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)" -+D="CC=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DDEBUG -DTHREADS" - #FLAGS = -g - - all: -- cd libs ; make $(M) ; cd ../dns ; make $(M) ; \ -- cd ../rng ; make $(M) ; cd ../parse ; make $(M) ; \ -- cd ../qual ; make $(M) ; cd ../server ; \ -+ cd libs ; $(MAKE) $(M) ; cd ../dns ; $(MAKE) $(M) ; \ -+ cd ../rng ; $(MAKE) $(M) ; cd ../parse ; $(MAKE) $(M) ; \ -+ cd ../qual ; $(MAKE) $(M) ; cd ../server ; \ - make $(M) $(V) COMPILED=\"$(COMPILED)\" ; \ -- cd ../tools ; make $(M) ; \ -- cd ../deadwood-*/src/ ; make FLAGS=-O2 ; \ -- cd ../../tcp ; make $(M) $(V) ; cat ../00README.FIRST -+ cd ../tools ; $(MAKE) $(M) ; \ -+ cd ../deadwood-*/src/ ; $(MAKE) $(M) ; \ -+ cd ../../tcp ; $(MAKE) $(M) $(V) ; cat ../00README.FIRST - - debug: -- cd libs ; make $(D) DEBUG="-DDEBUG -DTHREADS" ; \ -- cd ../dns ; make $(D) ; cd ../rng ; make $(D) ; \ -- cd ../parse ; make $(D) ; cd ../qual ; make $(D) ; \ -+ cd libs ; $(MAKE) $(D) DEBUG="-DDEBUG -DTHREADS" ; \ -+ cd ../dns ; $(MAKE) $(D) ; cd ../rng ; $(MAKE) $(D) ; \ -+ cd ../parse ; $(MAKE) $(D) ; cd ../qual ; $(MAKE) $(D) ; \ - cd ../server ; \ - make $(D) $(Q) $(V) COMPILED=\"$(COMPILED_DEBUG)\" ; \ -- cd ../tools ; make $(D) ; \ -- cd ../tcp ; make $(D) $(V) ; cat ../00README.FIRST -+ cd ../tools ; $(MAKE) $(D) ; \ -+ cd ../tcp ; $(MAKE) $(D) $(V) ; cat ../00README.FIRST - - clean: - rm -f $(OBJECTS) core $(EXECS) ; \ -- cp build/Makefile.w Makefile ; cd dns ; make clean ; \ -- cd ../libs ; make clean ; cd ../parse ; make clean ; \ -- cd ../qual ; make clean ; \ -- cd ../server ; make clean ; \ -+ cp build/Makefile.w Makefile ; cd dns ; $(MAKE) clean ; \ -+ cd ../libs ; $(MAKE) clean ; cd ../parse ; $(MAKE) clean ; \ -+ cd ../qual ; $(MAKE) clean ; \ -+ cd ../server ; $(MAKE) clean ; \ - cp Makefile.recursive Makefile ; \ -- cd ../test ; make clean ; \ -- cd ../tools ; make clean ; \ -- cd misc ; make clean ; \ -- cd ../../utf8 ; make clean ; \ -- cd ../tcp ; make clean ; \ -- cd ../rng ; make clean ; \ -- cd ../sqa ; make clean ; \ -- cd ../deadwood-*/src ; make clean ; \ -+ cd ../test ; $(MAKE) clean ; \ -+ cd ../tools ; $(MAKE) clean ; \ -+ cd misc ; $(MAKE) clean ; \ -+ cd ../../utf8 ; $(MAKE) clean ; \ -+ cd ../tcp ; $(MAKE) clean ; \ -+ cd ../rng ; $(MAKE) clean ; \ -+ cd ../sqa ; $(MAKE) clean ; \ -+ cd ../deadwood-*/src ; $(MAKE) clean ; \ - # ; cd .. ; find . -type d | grep .deps | xargs rm -fr ; find . -name '*.o' | xargs rm - - strip: -diff --git a/configure b/configure -index 9e98ac8..fedbd87 100755 ---- a/configure -+++ b/configure -@@ -174,14 +174,14 @@ if [ -z "$IPV6" ] ; then - cp tcp/Makefile.authonly tcp/Makefile - cp dns/Makefile.authonly dns/Makefile - cp tools/Makefile.authonly tools/Makefile -+ DEADWOOD_DIR=$( echo deadwood-* ) -+ cp $DEADWOOD_DIR/src/Makefile.noipv6 $DEADWOOD_DIR/src/Makefile - else - cp server/Makefile.ipv6 server/Makefile - cp qual/Makefile.nothreads qual/Makefile - cp tcp/Makefile.ipv6 tcp/Makefile - cp dns/Makefile.authonly dns/Makefile - cp tools/Makefile.ipv6 tools/Makefile -- DEADWOOD_DIR=$( echo deadwood-* ) -- cp $DEADWOOD_DIR/src/Makefile.ipv6 $DEADWOOD_DIR/src/Makefile - fi - - echo --- -2.26.3 - diff --git a/net-dns/maradns/files/maradns-3.5.0022-flags.patch b/net-dns/maradns/files/maradns-3.5.0022-flags.patch new file mode 100644 index 000000000000..9f01795fd2bb --- /dev/null +++ b/net-dns/maradns/files/maradns-3.5.0022-flags.patch @@ -0,0 +1,65 @@ +From 15470045421448a7a6813e2a4a96e18bba3b0aa4 Mon Sep 17 00:00:00 2001 +From: Victor Kustov <ktrace@yandex.ru> +Date: Wed, 27 Jul 2022 21:28:31 +0300 +Subject: [PATCH] 2nd + +--- + build/Makefile.linux | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + +diff --git a/build/Makefile.linux b/build/Makefile.linux +index 965c7fb..572dccc 100644 +--- a/build/Makefile.linux ++++ b/build/Makefile.linux +@@ -24,32 +24,32 @@ EXECS=server/maradns + # end the Solaris section + # Non-Solaris version of "M" + V="VERSION=$(VERSION)" +-Q="DEFINES=-DSELECT_PROBLEM" ++Q="$(LDFLAGS) DEFINES=-DSELECT_PROBLEM" + + # Debug + + FLAGS = -O2 -Wall -DSELECT_PROBLEM +-M="CC=$(CC) $(FLAGS)" +-D="CC=$(CC) $(FLAGS) -DDEBUG -DTHREADS" ++M="CC=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)" ++D="CC=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DDEBUG -DTHREADS" + #FLAGS = -g + + all: +- cd libs ; make $(M) ; cd ../dns ; make $(M) ; \ +- cd ../rng ; make $(M) ; cd ../parse ; make $(M) ; \ +- cd ../qual ; make $(M) ; cd ../server ; \ +- make $(M) $(V) COMPILED=\"$(COMPILED)\" ; \ +- cd ../tools ; make $(M) ; \ +- cd ../deadwood-*/src/ ; make FLAGS=-O2 ; \ +- cd ../../tcp ; make $(M) $(V) ; cat ../00README.FIRST ++ cd libs ; $(MAKE) $(M) ; cd ../dns ; $(MAKE) $(M) ; \ ++ cd ../rng ; $(MAKE) $(M) ; cd ../parse ; $(MAKE) $(M) ; \ ++ cd ../qual ; $(MAKE) $(M) ; cd ../server ; \ ++ $(MAKE) $(M) $(V) COMPILED=\"$(COMPILED)\" ; \ ++ cd ../tools ; $(MAKE) $(M) ; \ ++ cd ../deadwood-*/src/ ; $(MAKE) $(M) ; \ ++ cd ../../tcp ; $(MAKE) $(M) $(V) ; cat ../00README.FIRST + + debug: +- cd libs ; make $(D) DEBUG="-DDEBUG -DTHREADS" ; \ +- cd ../dns ; make $(D) ; cd ../rng ; make $(D) ; \ +- cd ../parse ; make $(D) ; cd ../qual ; make $(D) ; \ ++ cd libs ; $(MAKE) $(D) ; \ ++ cd ../dns ; $(MAKE) $(D) ; cd ../rng ; $(MAKE) $(D) ; \ ++ cd ../parse ; $(MAKE) $(D) ; cd ../qual ; $(MAKE) $(D) ; \ + cd ../server ; \ +- make $(D) $(Q) $(V) COMPILED=\"$(COMPILED_DEBUG)\" ; \ +- cd ../tools ; make $(D) ; \ +- cd ../tcp ; make $(D) $(V) ; cat ../00README.FIRST ++ $(MAKE) $(D) $(Q) $(V) COMPILED=\"$(COMPILED_DEBUG)\" ; \ ++ cd ../tools ; $(MAKE) $(D) ; \ ++ cd ../tcp ; $(MAKE) $(D) $(V) ; cat ../00README.FIRST + + clean: + rm -f $(OBJECTS) core $(EXECS) ; \ +-- +2.35.1 + diff --git a/net-dns/maradns/files/maradns-3.5.0036-flags.patch b/net-dns/maradns/files/maradns-3.5.0036-flags.patch new file mode 100644 index 000000000000..923417538778 --- /dev/null +++ b/net-dns/maradns/files/maradns-3.5.0036-flags.patch @@ -0,0 +1,56 @@ +Rebased on 2024-01-20, version 3.5.0036 + +From 15470045421448a7a6813e2a4a96e18bba3b0aa4 Mon Sep 17 00:00:00 2001 +From: Victor Kustov <ktrace@yandex.ru> +Date: Wed, 27 Jul 2022 21:28:31 +0300 +Subject: [PATCH] 2nd + +diff --git a/build/Makefile.linux b/build/Makefile.linux +index 9d8117e..22a7518 100644 +--- a/build/Makefile.linux ++++ b/build/Makefile.linux +@@ -29,29 +29,27 @@ Q="DEFINES=-DSELECT_PROBLEM" + # Debug + + FLAGS = -O2 -Wall -DSELECT_PROBLEM +-M="CC=$(CC) $(FLAGS)" +-D="CC=$(CC) $(FLAGS) -DDEBUG -DTHREADS" ++M="CC=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)" ++D="CC=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DDEBUG -DTHREADS" + #FLAGS = -g + + all: +- cd libs ; make $(M) ; cd ../dns ; make $(M) ; \ +- cd ../rng ; make $(M) ; cd ../parse ; make $(M) ; \ +- cd ../qual ; make $(M) ; cd ../server ; \ +- make $(M) $(V) COMPILED=\"$(COMPILED)\" ; \ +- cd ../tools ; make $(M) ; \ +- cd ../deadwood-*/src/ ; make FLAGS=-O2 ; \ +- cd ../tools/blockhash ; make CFLAGS=-O2 ; \ +- cd ../../../coLunacyDNS/ ; make ; \ +- cd ../tcp ; make $(M) $(V) ; cat ../00README.FIRST ++ cd libs ; $(MAKE) $(M) ; cd ../dns ; $(MAKE) $(M) ; \ ++ cd ../rng ; $(MAKE) $(M) ; cd ../parse ; $(MAKE) $(M) ; \ ++ cd ../qual ; $(MAKE) $(M) ; cd ../server ; \ ++ $(MAKE) $(M) $(V) COMPILED=\"$(COMPILED)\" ; \ ++ cd ../tools ; $(MAKE) $(M) ; \ ++ cd ../deadwood-*/src/ ; $(MAKE) $(M) ; \ ++ cd ../../tcp ; $(MAKE) $(M) $(V) ; cat ../00README.FIRST + + debug: +- cd libs ; make $(D) DEBUG="-DDEBUG -DTHREADS" ; \ +- cd ../dns ; make $(D) ; cd ../rng ; make $(D) ; \ +- cd ../parse ; make $(D) ; cd ../qual ; make $(D) ; \ ++ cd libs ; $(MAKE) $(D) ; \ ++ cd ../dns ; $(MAKE) $(D) ; cd ../rng ; $(MAKE) $(D) ; \ ++ cd ../parse ; $(MAKE) $(D) ; cd ../qual ; $(MAKE) $(D) ; \ + cd ../server ; \ +- make $(D) $(Q) $(V) COMPILED=\"$(COMPILED_DEBUG)\" ; \ +- cd ../tools ; make $(D) ; \ +- cd ../tcp ; make $(D) $(V) ; cat ../00README.FIRST ++ $(MAKE) $(D) $(Q) $(V) COMPILED=\"$(COMPILED_DEBUG)\" ; \ ++ cd ../tools ; $(MAKE) $(D) ; \ ++ cd ../tcp ; $(MAKE) $(D) $(V) ; cat ../00README.FIRST + + clean: + rm -f $(OBJECTS) core $(EXECS) ; \ diff --git a/net-dns/maradns/maradns-3.5.0020.ebuild b/net-dns/maradns/maradns-3.5.0022.ebuild index 6bf474750b66..4492b31c472c 100644 --- a/net-dns/maradns/maradns-3.5.0020.ebuild +++ b/net-dns/maradns/maradns-3.5.0022.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..10} ) -inherit python-any-r1 systemd toolchain-funcs +PYTHON_COMPAT=( python3_{10..11} ) +inherit flag-o-matic python-any-r1 systemd toolchain-funcs DESCRIPTION="A security-aware DNS server" HOMEPAGE="https://maradns.samiam.org" @@ -13,19 +13,18 @@ SRC_URI="https://maradns.samiam.org/download/${PV%.*}/${PV}/${P}.tar.xz" # The GPL-2 covers the init script, bug 426018. LICENSE="BSD-2 GPL-2" SLOT="0" -KEYWORDS="~amd64 ~mips ~ppc ~x86" -IUSE="examples ipv6" +KEYWORDS="amd64 ~mips ~ppc x86" +IUSE="examples" BDEPEND="${PYTHON_DEPS} dev-lang/perl" -DEPEND=" +RDEPEND=" acct-group/maradns acct-user/duende acct-user/maradns" -RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}"/${P}-flags-ipv6.patch + "${FILESDIR}"/${P}-flags.patch ) src_prepare() { @@ -34,9 +33,13 @@ src_prepare() { } src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/861293 + # https://github.com/samboy/MaraDNS/discussions/124 + filter-lto + tc-export CC - ./configure \ - $(usex ipv6 --ipv6 "") || die "Failed to configure" + ./configure --ipv6 || die "Failed to configure" } src_install() { @@ -49,7 +52,7 @@ src_install() { # MaraDNS docs, manpages, misc docompress -x /usr/share/doc/${PF}/maradns.gpg.key - dodoc {CHANGELOG,COPYING,SUPPORT,maradns.gpg.key} + dodoc {CHANGELOG.TXT,COPYING,SUPPORT,maradns.gpg.key} dodoc doc/en/{QuickStart,faq.*,*.md,README} dodoc -r doc/en/{text,webpage,tutorial} docinto deadwood diff --git a/net-dns/maradns/maradns-3.5.0005.ebuild b/net-dns/maradns/maradns-3.5.0036.ebuild index 0b520db460fc..de0218026790 100644 --- a/net-dns/maradns/maradns-3.5.0005.ebuild +++ b/net-dns/maradns/maradns-3.5.0036.ebuild @@ -1,47 +1,42 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..9} ) -inherit python-any-r1 systemd toolchain-funcs +PYTHON_COMPAT=( python3_{10..12} ) +inherit flag-o-matic python-any-r1 systemd toolchain-funcs DESCRIPTION="A security-aware DNS server" -HOMEPAGE="http://www.maradns.org/" +HOMEPAGE="https://maradns.samiam.org" SRC_URI="https://maradns.samiam.org/download/${PV%.*}/${PV}/${P}.tar.xz" # The GPL-2 covers the init script, bug 426018. LICENSE="BSD-2 GPL-2" SLOT="0" -KEYWORDS="amd64 ~mips ~ppc x86" -IUSE="examples ipv6" +KEYWORDS="~amd64 ~mips ~ppc ~x86" +IUSE="examples" BDEPEND="${PYTHON_DEPS} dev-lang/perl" -DEPEND=" +RDEPEND=" acct-group/maradns acct-user/duende acct-user/maradns" -RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}"/${P}-flags.patch + "${FILESDIR}"/${PN}-3.5.0036-flags.patch ) -src_prepare() { - default - - # replace "make" by "$(MAKE)" to avoid GNU Make warning - sed -i 's/\ make\ /\ \$\(MAKE\)\ /g' build/Makefile.linux \ - || die "can't patch build/Makefile.linux" - - python_fix_shebang tools/bind2csv2.py -} - src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/861293 + # https://github.com/samboy/MaraDNS/discussions/124 + # + # should be fixed in git master; try removing this on the next bump + filter-lto + tc-export CC - ./configure \ - $(usex ipv6 --ipv6 "") || die "Failed to configure ${PN}" + ./configure --ipv6 || die "Failed to configure" } src_install() { @@ -50,12 +45,13 @@ src_install() { dosbin tcp/zoneserver dosbin deadwood-${PV}/src/Deadwood dobin tcp/{getzone,fetchzone} - dobin tools/{askmara,askmara-tcp,duende,bind2csv2.py,csv1tocsv2.pl} + dobin tools/{askmara,askmara-tcp,duende} # MaraDNS docs, manpages, misc - dodoc doc/en/{QuickStart,README,*.txt,*.html} - dodoc -r doc/en/{text,webpage,tutorial} - dodoc maradns.gpg.key + docompress -x /usr/share/doc/${PF}/maradns.gpg.key + dodoc {CHANGELOG.TXT,COPYING,maradns.gpg.key} + dodoc doc/en/{QuickStart,faq.*,*.md,README} + dodoc -r doc/en/{text,tutorial} docinto deadwood dodoc deadwood-${PV}/doc/{*.txt,*.html,CHANGELOG,Deadwood-HOWTO} dodoc -r deadwood-${PV}/doc/internals @@ -68,7 +64,6 @@ src_install() { # Install manpages doman doc/en/man/*.[1-9] - doman deadwood-${PV}/doc/{Deadwood,Duende}.1 # Example configurations. insinto /etc/maradns @@ -91,3 +86,10 @@ src_install() { systemd_dounit "${T}"/maradns.service } + +pkg_postinst() { + elog "Examples of configuration files can be found in the" + elog "/etc/maradns directory, feel free use it like:" + elog " cp /etc/maradns/mararc{_full.dist,}" + elog "and edit /etc/maradns/mararc as described in man mararc." +} diff --git a/net-dns/maradns/metadata.xml b/net-dns/maradns/metadata.xml index cef4084d070a..fb814e265bc9 100644 --- a/net-dns/maradns/metadata.xml +++ b/net-dns/maradns/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>slashbeast@gentoo.org</email> - <name>Piotr Karbowski</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">samboy/MaraDNS</remote-id> </upstream> diff --git a/net-dns/mydns/mydns-1.2.8.31-r2.ebuild b/net-dns/mydns/mydns-1.2.8.31-r2.ebuild index 0c9ae6161d59..1958484d8b1b 100644 --- a/net-dns/mydns/mydns-1.2.8.31-r2.ebuild +++ b/net-dns/mydns/mydns-1.2.8.31-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~sparc x86" IUSE="alias debug nls mysql postgres ssl static status" -BDEPEND="sys-devel/bison" +BDEPEND="app-alternatives/yacc" RDEPEND=" virtual/libiconv mysql? ( dev-db/mysql-connector-c:= ) diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest index 4705886c0228..26d35df9b207 100644 --- a/net-dns/nsd/Manifest +++ b/net-dns/nsd/Manifest @@ -1,4 +1,2 @@ -DIST nsd-4.3.8.tar.gz 1225840 BLAKE2B 19d014f130844aab5b7c6224658c6e5a4a7d8d337ceb11e1641bceb367fe76b46be146c703296a12cec834020992eabec0e1ee8f3cb6211333ac8c4c7029fef5 SHA512 aec892f85a6757bfdf537c6f0b4bc3d60c564b3062b582af14df800b24261edc96bedcd0b6649444a46b198b9018397e356b919a871364032c8a2db6256b9268 -DIST nsd-4.3.9.tar.gz 1222919 BLAKE2B 0b317c246f66476e95727d763bf7444cde14936c8a87036843458b89f8c79790130995db3f0f9ff33d8bfda756cf3ae4724b07f97ee2996f05a2dcd1c14bc0e5 SHA512 de170cbaf6e0be0a20941d9d6b2102a7dddb59a320c30566238447d5740e4497f751f54488f36c2b89f2c3cff6e3101df31a36d0d2d66db8d77cfb6e86124f32 -DIST nsd-4.4.0.tar.gz 1226433 BLAKE2B 8ead662c2ad87e9cfd9424898758cb7a7e6adc3c419583e0a4c3ced4d6bb8ae5005266af621ee4c138a06215652b60b65f075a875b6473dc92d1bef414901be1 SHA512 0fa32337246ccdaf9d6fe4257792cef8b6ce6de086fdee1024983da7b90a77b9039061cee87a2e0ad7eddf195411c57f4777469d973f2bdc10d3a51ee96d90bc -DIST nsd-4.5.0.tar.gz 1259059 BLAKE2B 5c90a17b2c2df3cf06bea2609fb02198b4fdde3e9ed7cc0a07526d43069f735458a0c1775fc7b45ac7bd1fba42ec329fe5b67378d6282bf86f6c520f73b00397 SHA512 0309e1ff083b6f2118ba6fd59425319c21f31558d30e17a40eb8f1e53dee9e3e766d7b53eb50462130ba17b454a3559dc786d344cb779468d255732bbc6bc5da +DIST nsd-4.7.0.tar.gz 1289477 BLAKE2B d3949c8b65376ea78c700efaeb988acbfac5a5ba338f9bf29035176a7da6730ee8b7a2b6bfc5573ad178db80166ca74d71d313bf3d405acc666bf87f17dac63b SHA512 387e66993517c015ea49fc7a985c1f746623ae30a82bd01f224efbdb7c58d1d2f3e5a5a3574203959047876c632ec464b6682d1644f0e0f157ec0e6fb3f0cdbb +DIST nsd-4.8.0.tar.gz 1273228 BLAKE2B d1e6a5e8fb158bb32081bc7674d957e3f5a596ed10ee89dd6a5f6af9a79a8c130f2de7070345bee69cb7798e9f373d856a9336a9e9f65f733ff45e15e94833ff SHA512 13c9cffffe6adfcbabf744ee2effebe6ae265d83476345a1edb60dc9c6d7f838a5e239e9b18e667924e5e76b74b2caac63818fcaecf7f0fa651ff21736174a46 diff --git a/net-dns/nsd/files/nsd-4.3.9-no_ssl.patch b/net-dns/nsd/files/nsd-4.3.9-no_ssl.patch deleted file mode 100644 index 33553a0ec889..000000000000 --- a/net-dns/nsd/files/nsd-4.3.9-no_ssl.patch +++ /dev/null @@ -1,22 +0,0 @@ -From c5e6a8e5e566380c8c6731e9feb7ac686a1c0735 Mon Sep 17 00:00:00 2001 -From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl> -Date: Fri, 28 Jan 2022 16:38:53 +0100 -Subject: [PATCH] - Fix #206: build with --without-ssl fails. - -diff --git a/edns.c b/edns.c -index c7fc39d9..478ec681 100644 ---- a/edns.c -+++ b/edns.c -@@ -21,6 +21,12 @@ - #include "nsd.h" - #include "query.h" - -+#if !defined(HAVE_SSL) || !defined(HAVE_CRYPTO_MEMCMP) -+/* we need fixed time compare, pull it in from tsig.c */ -+#define CRYPTO_memcmp memcmp_fixedtime -+int memcmp_fixedtime(const void *s1, const void *s2, size_t n); -+#endif -+ - void - edns_init_data(edns_data_type *data, uint16_t max_length) - { diff --git a/net-dns/nsd/files/nsd-4.7.0-no-bind8-stats-no-ssl.patch b/net-dns/nsd/files/nsd-4.7.0-no-bind8-stats-no-ssl.patch new file mode 100644 index 000000000000..402a42e19e0c --- /dev/null +++ b/net-dns/nsd/files/nsd-4.7.0-no-bind8-stats-no-ssl.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/907997 +https://github.com/NLnetLabs/nsd/issues/283 +https://github.com/NLnetLabs/nsd/commit/f31d31ab1d45d615ebd192beaacac66746e0ff80 + +From f31d31ab1d45d615ebd192beaacac66746e0ff80 Mon Sep 17 00:00:00 2001 +From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl> +Date: Wed, 7 Jun 2023 13:07:53 +0200 +Subject: [PATCH] - Fix #283: Compile failure in remote.c when + --disable-bind8-stats + +--- a/remote.c ++++ b/remote.c +@@ -1246,7 +1246,9 @@ do_stats(struct daemon_remote* rc, int peek, struct rc_state* rs) + xfrd_set_reload_now(xfrd); + #else + RES res; ++#ifdef HAVE_SSL + res.ssl = rs->ssl; ++#endif + res.fd = rs->fd; + (void)rc; (void)peek; + (void)ssl_printf(&res, "error no stats enabled at compile time\n"); + diff --git a/net-dns/nsd/files/nsd-4.8.0-implausible-stats.patch b/net-dns/nsd/files/nsd-4.8.0-implausible-stats.patch new file mode 100644 index 000000000000..318f2a5e2f55 --- /dev/null +++ b/net-dns/nsd/files/nsd-4.8.0-implausible-stats.patch @@ -0,0 +1,22 @@ +https://github.com/NLnetLabs/nsd/issues/313 +https://github.com/NLnetLabs/nsd/commit/ccc1bbc28abd3a723c25cb8dcc735731926979d0 + +From ccc1bbc28abd3a723c25cb8dcc735731926979d0 Mon Sep 17 00:00:00 2001 +From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl> +Date: Tue, 6 Feb 2024 11:44:24 +0100 +Subject: [PATCH] - Fix #313: nsd 4.8 stats with implausible spikes. + +--- a/remote.c ++++ b/remote.c +@@ -2932,7 +2932,9 @@ process_stats(RES* ssl, xfrd_state_type* xfrd, int peek) + process_stats_manage_clear(xfrd, stats, peek); + process_stats_add_total(xfrd, &total, stats); + print_stats(ssl, xfrd, &stattime, !peek, &total, zonestats); +- xfrd->nsd->rc->stats_time = stattime; ++ if(!peek) { ++ xfrd->nsd->rc->stats_time = stattime; ++ } + + free(stats); + #ifdef USE_ZONE_STATS + diff --git a/net-dns/nsd/metadata.xml b/net-dns/nsd/metadata.xml index 65d7e2344b78..a1842bb7c035 100644 --- a/net-dns/nsd/metadata.xml +++ b/net-dns/nsd/metadata.xml @@ -2,8 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> + <email>kumba@gentoo.org</email> + <name>Joshua Kinard</name> </maintainer> <use> <flag name="bind8-stats">Enables BIND8 like NSTATS and XSTATS</flag> @@ -17,8 +17,6 @@ <flag name="ratelimit">Enables ratelimiting, based on query name, type and source</flag> <flag name="root-server">Configure NSD as a root server</flag> - <flag name="runtime-checks">Enable runtime checks, this could lead - to a reduced service level</flag> <flag name="munin"> Install a plugin for <pkg>net-analyzer/munin</pkg> to graph statistical data from nsd.</flag> diff --git a/net-dns/nsd/nsd-4.3.8.ebuild b/net-dns/nsd/nsd-4.3.8.ebuild deleted file mode 100644 index 492c7c14b1d6..000000000000 --- a/net-dns/nsd/nsd-4.3.8.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools systemd - -# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1 -MY_PV="${PV/_beta/b}" -MY_PV="${MY_PV/_rc/rc}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="An authoritative only, high performance, open source name server" -HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd" -SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz" -LICENSE="BSD" -SLOT="0" -[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ -KEYWORDS="amd64 x86" -IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd" - -S="${WORKDIR}/${MY_P}" - -RDEPEND=" - acct-group/nsd - acct-user/nsd - dnstap? ( - dev-libs/fstrm - dev-libs/protobuf-c - ) - libevent? ( dev-libs/libevent ) - munin? ( net-analyzer/munin ) - ssl? ( - dev-libs/openssl:0= - ) - systemd? ( sys-apps/systemd ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - sys-devel/flex - virtual/yacc - systemd? ( virtual/pkgconfig ) -" - -PATCHES=( - # Fix the paths in the munin plugin to match our install - "${FILESDIR}"/nsd_munin_.patch -) - -src_prepare() { - default - # Required to get correct pkg-config macros with USE="systemd" - # see bugs #663618 and #758050 - eautoreconf -} - -src_configure() { - local myeconfargs=( - --enable-largefile - --enable-pie - --enable-relro-now - --enable-tcp-fastopen - --with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db - --with-logfile="${EPREFIX}"/var/log/nsd.log - --with-pidfile="${EPREFIX}"/run/nsd/nsd.pid - --with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state - --with-xfrdir="${EPREFIX}"/var/db/nsd - --with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list - --with-zonesdir="${EPREFIX}"/var/lib/nsd - $(use_enable bind8-stats) - $(use_enable bind8-stats zone-stats) - $(use_enable dnstap) - $(use_enable ipv6) - $(use_enable minimal-responses) - $(use_enable mmap) - $(use_enable nsec3) - $(use_enable ratelimit) - $(use_enable root-server) - $(use_enable runtime-checks checking) - $(use_enable systemd) - $(use_with libevent) - $(use_with ssl) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS} - - newinitd "${FILESDIR}"/nsd.initd-r1 nsd - - # install munin plugin and config - if use munin ; then - exeinto /usr/libexec/munin/plugins - doexe contrib/nsd_munin_ - insinto /etc/munin/plugin-conf.d - newins "${FILESDIR}"/nsd.munin-conf nsd_munin - fi - - systemd_dounit "${FILESDIR}"/nsd.service - - # remove the /run directory that usually resides on tmpfs and is - # being taken care of by the nsd init script anyway (checkpath) - rm -r "${ED}"/run || die "Failed to remove /run" - - keepdir /var/db/${PN} -} - -pkg_postinst() { - # database directory, writable by nsd for database updates and zone transfers - install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd - - # zones directory, writable by nsd for zone file updates (nsd-control write) - install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd -} diff --git a/net-dns/nsd/nsd-4.3.9.ebuild b/net-dns/nsd/nsd-4.7.0.ebuild index e4f824b01061..e821654c0b57 100644 --- a/net-dns/nsd/nsd-4.3.9.ebuild +++ b/net-dns/nsd/nsd-4.7.0.ebuild @@ -1,25 +1,33 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit autotools systemd -# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1 -MY_PV="${PV/_beta/b}" -MY_PV="${MY_PV/_rc/rc}" -MY_P="${PN}-${MY_PV}" - DESCRIPTION="An authoritative only, high performance, open source name server" -HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd" -SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz" +HOMEPAGE="https://www.nlnetlabs.nl/projects/nsd" + +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/NLnetLabs/nsd.git" +else + # version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1 + MY_PV="${PV/_beta/b}" + MY_PV="${MY_PV/_rc/rc}" + MY_P="${PN}-${MY_PV}" + + if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then + SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz" + S="${WORKDIR}"/${MY_P} + + KEYWORDS="amd64 x86" + fi +fi + LICENSE="BSD" SLOT="0" -[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ -KEYWORDS="~amd64 ~x86" -IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd" - -S="${WORKDIR}/${MY_P}" +IUSE="bind8-stats debug dnstap libevent minimal-responses mmap munin +nsec3 ratelimit root-server ssl systemd" RDEPEND=" acct-group/nsd @@ -30,38 +38,39 @@ RDEPEND=" ) libevent? ( dev-libs/libevent ) munin? ( net-analyzer/munin ) - ssl? ( - dev-libs/openssl:0= - ) + ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) " DEPEND="${RDEPEND}" BDEPEND=" - sys-devel/flex - virtual/yacc + app-alternatives/lex + app-alternatives/yacc systemd? ( virtual/pkgconfig ) " PATCHES=( # Fix the paths in the munin plugin to match our install "${FILESDIR}"/nsd_munin_.patch - - "${FILESDIR}/${P}-no_ssl.patch" #832213 + # bug #907997 + "${FILESDIR}"/${P}-no-bind8-stats-no-ssl.patch ) src_prepare() { default + # Required to get correct pkg-config macros with USE="systemd" - # see bugs #663618 and #758050 + # See bugs #663618 and #758050 eautoreconf } src_configure() { local myeconfargs=( + --enable-ipv6 --enable-largefile --enable-pie --enable-relro-now --enable-tcp-fastopen + --with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db --with-logfile="${EPREFIX}"/var/log/nsd.log --with-pidfile="${EPREFIX}"/run/nsd/nsd.pid @@ -69,20 +78,21 @@ src_configure() { --with-xfrdir="${EPREFIX}"/var/db/nsd --with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list --with-zonesdir="${EPREFIX}"/var/lib/nsd + $(use_enable bind8-stats) $(use_enable bind8-stats zone-stats) + $(use_enable debug checking) $(use_enable dnstap) - $(use_enable ipv6) $(use_enable minimal-responses) $(use_enable mmap) $(use_enable nsec3) $(use_enable ratelimit) $(use_enable root-server) - $(use_enable runtime-checks checking) $(use_enable systemd) $(use_with libevent) $(use_with ssl) ) + econf "${myeconfargs[@]}" } @@ -93,7 +103,7 @@ src_install() { newinitd "${FILESDIR}"/nsd.initd-r1 nsd - # install munin plugin and config + # Install munin plugin and config if use munin ; then exeinto /usr/libexec/munin/plugins doexe contrib/nsd_munin_ @@ -103,7 +113,7 @@ src_install() { systemd_dounit "${FILESDIR}"/nsd.service - # remove the /run directory that usually resides on tmpfs and is + # Remove the /run directory that usually resides on tmpfs and is # being taken care of by the nsd init script anyway (checkpath) rm -r "${ED}"/run || die "Failed to remove /run" diff --git a/net-dns/nsd/nsd-4.5.0.ebuild b/net-dns/nsd/nsd-4.8.0-r1.ebuild index a41057e6300d..fc6955f83a99 100644 --- a/net-dns/nsd/nsd-4.5.0.ebuild +++ b/net-dns/nsd/nsd-4.8.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,10 +6,9 @@ EAPI=8 inherit autotools systemd DESCRIPTION="An authoritative only, high performance, open source name server" -HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd" -LICENSE="BSD" -SLOT="0" -if [[ "${PV}" == *9999 ]] ; then +HOMEPAGE="https://www.nlnetlabs.nl/projects/nsd" + +if [[ ${PV} == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/NLnetLabs/nsd.git" else @@ -18,12 +17,17 @@ else MY_PV="${MY_PV/_rc/rc}" MY_P="${PN}-${MY_PV}" - [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~amd64 ~x86" - SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz" - S="${WORKDIR}/${MY_P}" + if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then + SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz" + S="${WORKDIR}"/${MY_P} + + KEYWORDS="amd64 x86" + fi fi -IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd" + +LICENSE="BSD" +SLOT="0" +IUSE="bind8-stats debug dnstap libevent minimal-responses mmap munin +nsec3 ratelimit root-server ssl systemd" RDEPEND=" acct-group/nsd @@ -39,29 +43,33 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND=" - sys-devel/flex - virtual/yacc + app-alternatives/lex + app-alternatives/yacc systemd? ( virtual/pkgconfig ) " PATCHES=( # Fix the paths in the munin plugin to match our install "${FILESDIR}"/nsd_munin_.patch + "${FILESDIR}"/${P}-implausible-stats.patch ) src_prepare() { default + # Required to get correct pkg-config macros with USE="systemd" - # see bugs #663618 and #758050 + # See bugs #663618 and #758050 eautoreconf } src_configure() { local myeconfargs=( + --enable-ipv6 --enable-largefile --enable-pie --enable-relro-now --enable-tcp-fastopen + --with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db --with-logfile="${EPREFIX}"/var/log/nsd.log --with-pidfile="${EPREFIX}"/run/nsd/nsd.pid @@ -69,20 +77,21 @@ src_configure() { --with-xfrdir="${EPREFIX}"/var/db/nsd --with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list --with-zonesdir="${EPREFIX}"/var/lib/nsd + $(use_enable bind8-stats) $(use_enable bind8-stats zone-stats) + $(use_enable debug checking) $(use_enable dnstap) - $(use_enable ipv6) $(use_enable minimal-responses) $(use_enable mmap) $(use_enable nsec3) $(use_enable ratelimit) $(use_enable root-server) - $(use_enable runtime-checks checking) $(use_enable systemd) $(use_with libevent) $(use_with ssl) ) + econf "${myeconfargs[@]}" } @@ -93,7 +102,7 @@ src_install() { newinitd "${FILESDIR}"/nsd.initd-r1 nsd - # install munin plugin and config + # Install munin plugin and config if use munin ; then exeinto /usr/libexec/munin/plugins doexe contrib/nsd_munin_ @@ -103,7 +112,7 @@ src_install() { systemd_dounit "${FILESDIR}"/nsd.service - # remove the /run directory that usually resides on tmpfs and is + # Remove the /run directory that usually resides on tmpfs and is # being taken care of by the nsd init script anyway (checkpath) rm -r "${ED}"/run || die "Failed to remove /run" diff --git a/net-dns/nsd/nsd-4.4.0.ebuild b/net-dns/nsd/nsd-4.8.0.ebuild index a41057e6300d..ce4bcaba54e0 100644 --- a/net-dns/nsd/nsd-4.4.0.ebuild +++ b/net-dns/nsd/nsd-4.8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,10 +6,9 @@ EAPI=8 inherit autotools systemd DESCRIPTION="An authoritative only, high performance, open source name server" -HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd" -LICENSE="BSD" -SLOT="0" -if [[ "${PV}" == *9999 ]] ; then +HOMEPAGE="https://www.nlnetlabs.nl/projects/nsd" + +if [[ ${PV} == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/NLnetLabs/nsd.git" else @@ -18,12 +17,17 @@ else MY_PV="${MY_PV/_rc/rc}" MY_P="${PN}-${MY_PV}" - [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~amd64 ~x86" - SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz" - S="${WORKDIR}/${MY_P}" + if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then + SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz" + S="${WORKDIR}"/${MY_P} + + KEYWORDS="amd64 x86" + fi fi -IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd" + +LICENSE="BSD" +SLOT="0" +IUSE="bind8-stats debug dnstap libevent minimal-responses mmap munin +nsec3 ratelimit root-server ssl systemd" RDEPEND=" acct-group/nsd @@ -39,8 +43,8 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND=" - sys-devel/flex - virtual/yacc + app-alternatives/lex + app-alternatives/yacc systemd? ( virtual/pkgconfig ) " @@ -51,17 +55,20 @@ PATCHES=( src_prepare() { default + # Required to get correct pkg-config macros with USE="systemd" - # see bugs #663618 and #758050 + # See bugs #663618 and #758050 eautoreconf } src_configure() { local myeconfargs=( + --enable-ipv6 --enable-largefile --enable-pie --enable-relro-now --enable-tcp-fastopen + --with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db --with-logfile="${EPREFIX}"/var/log/nsd.log --with-pidfile="${EPREFIX}"/run/nsd/nsd.pid @@ -69,20 +76,21 @@ src_configure() { --with-xfrdir="${EPREFIX}"/var/db/nsd --with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list --with-zonesdir="${EPREFIX}"/var/lib/nsd + $(use_enable bind8-stats) $(use_enable bind8-stats zone-stats) + $(use_enable debug checking) $(use_enable dnstap) - $(use_enable ipv6) $(use_enable minimal-responses) $(use_enable mmap) $(use_enable nsec3) $(use_enable ratelimit) $(use_enable root-server) - $(use_enable runtime-checks checking) $(use_enable systemd) $(use_with libevent) $(use_with ssl) ) + econf "${myeconfargs[@]}" } @@ -93,7 +101,7 @@ src_install() { newinitd "${FILESDIR}"/nsd.initd-r1 nsd - # install munin plugin and config + # Install munin plugin and config if use munin ; then exeinto /usr/libexec/munin/plugins doexe contrib/nsd_munin_ @@ -103,7 +111,7 @@ src_install() { systemd_dounit "${FILESDIR}"/nsd.service - # remove the /run directory that usually resides on tmpfs and is + # Remove the /run directory that usually resides on tmpfs and is # being taken care of by the nsd init script anyway (checkpath) rm -r "${ED}"/run || die "Failed to remove /run" diff --git a/net-dns/nsd/nsd-9999.ebuild b/net-dns/nsd/nsd-9999.ebuild index a41057e6300d..abbd21ab799f 100644 --- a/net-dns/nsd/nsd-9999.ebuild +++ b/net-dns/nsd/nsd-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,10 +6,9 @@ EAPI=8 inherit autotools systemd DESCRIPTION="An authoritative only, high performance, open source name server" -HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd" -LICENSE="BSD" -SLOT="0" -if [[ "${PV}" == *9999 ]] ; then +HOMEPAGE="https://www.nlnetlabs.nl/projects/nsd" + +if [[ ${PV} == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/NLnetLabs/nsd.git" else @@ -18,12 +17,17 @@ else MY_PV="${MY_PV/_rc/rc}" MY_P="${PN}-${MY_PV}" - [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~amd64 ~x86" - SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz" - S="${WORKDIR}/${MY_P}" + if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then + SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz" + S="${WORKDIR}"/${MY_P} + + KEYWORDS="~amd64 ~x86" + fi fi -IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd" + +LICENSE="BSD" +SLOT="0" +IUSE="bind8-stats debug dnstap libevent minimal-responses mmap munin +nsec3 ratelimit root-server ssl systemd" RDEPEND=" acct-group/nsd @@ -39,8 +43,8 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND=" - sys-devel/flex - virtual/yacc + app-alternatives/lex + app-alternatives/yacc systemd? ( virtual/pkgconfig ) " @@ -51,17 +55,20 @@ PATCHES=( src_prepare() { default + # Required to get correct pkg-config macros with USE="systemd" - # see bugs #663618 and #758050 + # See bugs #663618 and #758050 eautoreconf } src_configure() { local myeconfargs=( + --enable-ipv6 --enable-largefile --enable-pie --enable-relro-now --enable-tcp-fastopen + --with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db --with-logfile="${EPREFIX}"/var/log/nsd.log --with-pidfile="${EPREFIX}"/run/nsd/nsd.pid @@ -69,20 +76,21 @@ src_configure() { --with-xfrdir="${EPREFIX}"/var/db/nsd --with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list --with-zonesdir="${EPREFIX}"/var/lib/nsd + $(use_enable bind8-stats) $(use_enable bind8-stats zone-stats) + $(use_enable debug checking) $(use_enable dnstap) - $(use_enable ipv6) $(use_enable minimal-responses) $(use_enable mmap) $(use_enable nsec3) $(use_enable ratelimit) $(use_enable root-server) - $(use_enable runtime-checks checking) $(use_enable systemd) $(use_with libevent) $(use_with ssl) ) + econf "${myeconfargs[@]}" } @@ -93,7 +101,7 @@ src_install() { newinitd "${FILESDIR}"/nsd.initd-r1 nsd - # install munin plugin and config + # Install munin plugin and config if use munin ; then exeinto /usr/libexec/munin/plugins doexe contrib/nsd_munin_ @@ -103,7 +111,7 @@ src_install() { systemd_dounit "${FILESDIR}"/nsd.service - # remove the /run directory that usually resides on tmpfs and is + # Remove the /run directory that usually resides on tmpfs and is # being taken care of by the nsd init script anyway (checkpath) rm -r "${ED}"/run || die "Failed to remove /run" diff --git a/net-dns/odsclient/Manifest b/net-dns/odsclient/Manifest deleted file mode 100644 index 2de2b57bb3e6..000000000000 --- a/net-dns/odsclient/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST odsclient-1.03.tar.gz 4263 BLAKE2B b4d04133b9ab837cd3df06cf331aeb5b0987d370d27e824776374135e0340e42449fa24027eaaed2a4921b82abc9a61e4f750fdf1aba1a33b91780a4662704dd SHA512 12cc8b734314ec23432fc7ca980e099eee04be84134740460b7ab3edcff1abfb116794504653ef0af72b27fdc2b074633b96196e1894092152e1bd0e8300ab11 diff --git a/net-dns/odsclient/files/1.03-gentoo.patch b/net-dns/odsclient/files/1.03-gentoo.patch deleted file mode 100644 index 76f93016a010..000000000000 --- a/net-dns/odsclient/files/1.03-gentoo.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/client.c -+++ b/client.c -@@ -40,7 +40,8 @@ - ret = getret(s); - if(ret == 795 || ret == 796) - { -- fprintf(stderr, "Updated successfully\n"); -+ fprintf(stderr, "Updated %s to %s successfully\n", -+ argv[3], ipaddress); - mydprintf(s, "QUIT\n"); - close(s); - exit(0); -@@ -50,7 +51,7 @@ - - } - } -- fprintf(stderr, "Unable to update host\n"); -+ fprintf(stderr, "Unable to update %s\n", argv[3]); - return 1; - } - diff --git a/net-dns/odsclient/metadata.xml b/net-dns/odsclient/metadata.xml deleted file mode 100644 index 85e4ed814fa2..000000000000 --- a/net-dns/odsclient/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/net-dns/odsclient/odsclient-1.03-r1.ebuild b/net-dns/odsclient/odsclient-1.03-r1.ebuild deleted file mode 100644 index 7437ef0ff5eb..000000000000 --- a/net-dns/odsclient/odsclient-1.03-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="Client for the Open Domain Server's dynamic dns" -HOMEPAGE="http://www.ods.org/" -SRC_URI="http://www.ods.org/dl/${P}.tar.gz" -LICENSE="LGPL-2.1" - -SLOT="0" -KEYWORDS="~amd64 x86" -IUSE="" - -PATCHES=( "${FILESDIR}/${PV}-gentoo.patch" ) - -src_prepare() { - default - sed -i Makefile -e 's| -o | $(LDFLAGS)&|g' || die "sed failed" -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" -} - -src_install() { - dosbin odsclient - einstalldocs -} diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest index c14ca9969b6a..cc67e3c2f5bf 100644 --- a/net-dns/opendnssec/Manifest +++ b/net-dns/opendnssec/Manifest @@ -1 +1 @@ -DIST opendnssec-2.1.10.tar.gz 1142027 BLAKE2B 063650744ffd1c6d6d3b702400c9617883394c6794743f7d61bd63f7bdaf688a3f2a80f47612e561a133a5689dad8b5f7392eec69779d1dc5632a121d9a41c8f SHA512 c7fdbf1c3867d7b53ac11ab5cb5e636af4595dbee8d704429c7fb84cc3a6b2082ed490c33aad7747d4ee1a2c580afcf24a260bc3ed29eaf5e9d337004045b82d +DIST opendnssec-2.1.13.tar.gz 1161140 BLAKE2B 964a612e191bf5feb09a8b214e3341fbe5fc03c847e22b33bfc64ec7712608fd0f944c3b089901f08d7e3d2a27cb47543b3d5d210de48708192bb87546dacfa3 SHA512 5f3926f0f144cf8819895da2ec81fce21e2a05cf0b83dd9174a72ebfdef99badc3bcff2d6685c498485113209e7c73ab9cf55b3e126009ce6cbcc3cde54d6051 diff --git a/net-dns/opendnssec/files/opendnssec-fix-mysql.patch b/net-dns/opendnssec/files/opendnssec-fix-mysql.patch new file mode 100644 index 000000000000..b138892dc232 --- /dev/null +++ b/net-dns/opendnssec/files/opendnssec-fix-mysql.patch @@ -0,0 +1,39 @@ +diff -urN opendnssec-2.1.13.orig/enforcer/src/db/db_backend_mysql.c opendnssec-2.1.13/enforcer/src/db/db_backend_mysql.c +--- opendnssec-2.1.13.orig/enforcer/src/db/db_backend_mysql.c 2023-06-26 13:24:05.000000000 +0200 ++++ opendnssec-2.1.13/enforcer/src/db/db_backend_mysql.c 2023-12-04 08:39:37.685365824 +0100 +@@ -72,7 +72,7 @@ + db_backend_mysql_bind_t* next; + MYSQL_BIND* bind; + unsigned long length; +- my_bool error; ++ _Bool error; + int value_enum; + }; + +@@ -270,7 +270,7 @@ + } + + bind->bind = (mysql_bind = &((*statement)->mysql_bind_output[i])); +- mysql_bind->is_null = (my_bool*)0; ++ mysql_bind->is_null = (_Bool*)0; + mysql_bind->error = &bind->error; + mysql_bind->length = &bind->length; + +@@ -959,7 +959,7 @@ + } + + (*bind)->bind->length = &((*bind)->bind->buffer_length); +- (*bind)->bind->is_null = (my_bool*)0; ++ (*bind)->bind->is_null = (_Bool*)0; + + switch (db_clause_type(clause)) { + case DB_CLAUSE_EQUAL: +@@ -1079,7 +1079,7 @@ + } + + bind->bind->length = &(bind->bind->buffer_length); +- bind->bind->is_null = (my_bool*)0; ++ bind->bind->is_null = (_Bool*)0; + + switch (db_value_type(value)) { + case DB_TYPE_PRIMARY_KEY: diff --git a/net-dns/opendnssec/metadata.xml b/net-dns/opendnssec/metadata.xml index c86a03d33842..142c2461b8ff 100644 --- a/net-dns/opendnssec/metadata.xml +++ b/net-dns/opendnssec/metadata.xml @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>mschiff@gentoo.org</email> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="signer">Enables signing capabilities for OpenDNSSEC</flag> <flag name="opensc">Enables support for storing DNSSEC keys through a <pkg>dev-libs/opensc</pkg> PKCS#11 interface</flag> diff --git a/net-dns/opendnssec/opendnssec-2.1.10-r2.ebuild b/net-dns/opendnssec/opendnssec-2.1.13.ebuild index 771b0a19985f..36ea2b040912 100644 --- a/net-dns/opendnssec/opendnssec-2.1.10-r2.ebuild +++ b/net-dns/opendnssec/opendnssec-2.1.13.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_P="${P/_}" PKCS11_IUSE="+softhsm opensc external-hsm" @@ -42,7 +42,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) test? ( app-text/trang dev-libs/softhsm:* @@ -58,6 +58,7 @@ REQUIRED_USE=" PATCHES=( "${FILESDIR}/${PN}-fix-run-dir-2.1.x.patch" "${FILESDIR}/${PN}-use-system-trang.patch" + "${FILESDIR}/${PN}-fix-mysql.patch" ) DOCS=( MIGRATION NEWS ) diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest index e05e2afad3f0..1f9e6db13769 100644 --- a/net-dns/openresolv/Manifest +++ b/net-dns/openresolv/Manifest @@ -1 +1,2 @@ DIST openresolv-3.12.0.tar.xz 21008 BLAKE2B 1609d8e97a9abe82f9ead7179727dd4323571e92b36aa2ca2a1177972f3a61946f612dd0cf81a804087f1c71bda25e78dab8b085ad2be55ce21214dc9870fdf6 SHA512 60348ca35114b105c8b3121e5f2d301311fcc7251a9be60c45fedc27267cfd94e413e77c7d5c91d0a0ccb8f1b4288bc147582b0ac9be64afcaa96ad3d833f26f +DIST openresolv-3.13.2.tar.xz 21540 BLAKE2B e9ea4524da9e19ae8837869d04f039b2a77b9c9d34826b383ad8396a7b0e79df570c04dff38d33f8aaade35a171ae2599333ac54cbd4d656c965f2d4a5ddfe9b SHA512 4f1bc3e2865bc233d12c29e75893b3e53db0b127a7167d9be4ddd0228ba4f689f62af93eab088fb4d4f66baa556ed402c7fc5ecb9c4af5509004125af60fa379 diff --git a/net-dns/openresolv/metadata.xml b/net-dns/openresolv/metadata.xml index 7c08cdb1085c..595978f0326f 100644 --- a/net-dns/openresolv/metadata.xml +++ b/net-dns/openresolv/metadata.xml @@ -5,5 +5,8 @@ <email>bkohler@gentoo.org</email> <name>Ben Kohler</name> </maintainer> + <upstream> + <remote-id type="github">NetworkConfiguration/openresolv</remote-id> + </upstream> <stabilize-allarches/> </pkgmetadata> diff --git a/net-dns/openresolv/openresolv-3.13.2-r1.ebuild b/net-dns/openresolv/openresolv-3.13.2-r1.ebuild new file mode 100644 index 000000000000..54934c323b7f --- /dev/null +++ b/net-dns/openresolv/openresolv-3.13.2-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A framework for managing DNS information" +HOMEPAGE="https://roy.marples.name/projects/openresolv" +SRC_URI="https://github.com/NetworkConfiguration/openresolv/releases/download/v${PV}/${P}.tar.xz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="selinux" + +RDEPEND="!sys-apps/systemd[resolvconf] + selinux? ( sec-policy/selinux-resolvconf )" + +src_configure() { + local myeconfargs=( + --prefix="${EPREFIX}" + --rundir="${EPREFIX}"/var/run + --libexecdir="${EPREFIX}"/lib/resolvconf + ) + econf "${myeconfargs[@]}" +} + +pkg_config() { + if [[ -n ${ROOT} ]]; then + eerror "We cannot configure unless \$ROOT is empty" + return 1 + fi + + if [[ -n "$(resolvconf -l)" ]]; then + einfo "${PN} already has DNS information" + else + ebegin "Copying /etc/resolv.conf to resolvconf -a dummy" + resolvconf -a dummy </etc/resolv.conf + eend $? || return $? + einfo "The dummy interface will disappear when you next reboot" + fi +} + +DOCS=( LICENSE README.md ) diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest index 9d82f3024287..2988ab61e1b3 100644 --- a/net-dns/pdns-recursor/Manifest +++ b/net-dns/pdns-recursor/Manifest @@ -1,2 +1,32 @@ -DIST pdns-recursor-4.6.1.tar.bz2 1541000 BLAKE2B fede4f654cd9900780df8dcc39585e95d8b0536c6d14476fde6f33a2d307144f50fb7b51bf6e0c950dcaff74120a101effee0c92cf15c4acedfa94a2682b0c5c SHA512 b595dd382bb4bff5cd47bff854952c8ee40bedeafe4236f935c8eceeca7ac97e8668b884e1ec0ce490ce535fab10d161ffc53ca395c0bb02ffcf6005a692674b -DIST pdns-recursor-4.6.2.tar.bz2 1552587 BLAKE2B 3e7fe59ebe9d776c012304fc1bf6ed723c1c15df0aaedcaa8ac538741e81c5b6ebac2528e763e1395a0ea383904e4a902319509580938caae85b3aef947cfc3d SHA512 20779a065720162f0a6223a4d92deeef7911892bb8aa1929f9c6a8a6ccd2f8756e7bd35c877dbf945bb7627a2a7d40626d02f0008c2e8a602b424d36c110fddc +DIST cc-1.0.84.crate 74922 BLAKE2B 8a6c1208b32648d1d3e33388f3fea506b82236dcdfc5d89865233c8567d80d55d8e102f30d5a6dc4b9a38bfb831974327048ac01ee7dbe7df04020e6c664f238 SHA512 c74a842b57d1239329b35af63070c147e75455c929999265eb0ddef9f360301c266885dee5f32b13d3cc1b953761db6f5949eb70ad9ecc2920777ec2c1507dbc +DIST codespan-reporting-0.11.1.crate 48963 BLAKE2B 39deb717a853ffbe3585e20a67fd7a75b62e2d796a66b5004876501fd7476acde9f126804f2ef6220ebab66821a3ccf058d544d689a2705eae44285f34b510cb SHA512 0869789f5c50d3523d3ee16a8fe64756498a13704efbe82bb0845eaa87c7b6b1d075b3b6b80567cd9fce6cb09c5179e9c07e485fd17ce56c8139ade0f8bc6844 +DIST cxx-1.0.110.crate 197887 BLAKE2B 5f727fe8bc2c46052208499f5bf0061b5cb3feefb30d96fad3f5d3f8fc67fc0a1d37148620a1c77bad4ecf2037559919c6f286451e56d41ae9933a5ea5fec775 SHA512 ee168deaf5f08bed4f6f4613c38ccf0c219ec00393204c67d6ce5495ecaf1cc67a7ad30d36f2277cfd276ba284ebe37aa784a81d59019ab973988ab52ee3c136 +DIST cxx-build-1.0.110.crate 86469 BLAKE2B 91dfb19587505c020f1130a9f213a9e8f496ea3a1feeefd471b0d3cb4f60a7abbe8ba4bb41ae63ef1b231806b5407fe0850907bd79fd462a81919e8515f534e4 SHA512 a37dfbe97a03026d8469db25c2dbb5110f301a72b22f0b0d98559c7f69a39ad6786f2a9c7a8d6bba3286f374a2024d7b5aaafa7bfc9a603444032f75c7019fdc +DIST cxxbridge-flags-1.0.110.crate 5284 BLAKE2B f8cd35bb64cb0b8e371f3c58f251a7595d105e5ca628c1ca016bd831d8ba18c4f598b1a47d32ae6256f24feb8d3aac116c046a42a9a03115d506bb684b0e1a83 SHA512 c78014624144232e84a76f649fef90ac8187fef76bdd802f9d75fdc502b56946580303c39141750544490521c787a9ee7398e40529f791e6066c57ade0c105a0 +DIST cxxbridge-macro-1.0.110.crate 60405 BLAKE2B 38d1f105a427cd0ab40508ce190e45e6e4829051347fc5677d9cbd35551719f119ddf938cd0152f2624f4305fe98e6219dcc117780e64e9480b76ccbc66ce7f7 SHA512 3119839d71d55805dfa22308add558cc4973bd9e7991f04a155da0e81f3e1c927282cff494c205eee6df42c8ad4c97ecf94ad4fe1f5842dd926be8e4d695f6e0 +DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140 +DIST hashbrown-0.14.2.crate 140080 BLAKE2B 4a9fc89d77940d116d781ac6ca2a07a8ba3146fed54bd5d304d5ccb7722d27c053bbd83ec5ef897f1a25db50f838b73421677fd92be5d534a91909a7ad390d3b SHA512 a611359ccc8d859a72e812b94123ff162f5653caa1839c5f5e3269ed18b5fe2b2c7b15b4f03ae8076a622d08090a90e747d8cbcdfce9cf7f317592f1a3695351 +DIST indexmap-2.1.0.crate 68224 BLAKE2B 9d833570cbb63ecae138ca234b998bd0e5b11b1a7e3d5ef4a21212bb32d0998395f1fc609f66860bdbab198081687630f583f5a2e495fac1afa40ff48bee8a0f SHA512 9d303eef918b9264b9fe326cc1d71f4095f7ed5639ed8696efa3e9be65dff2c50ada4495409e109e7718997db51ae1fd865cf8e88978107d7823faba14380600 +DIST ipnet-2.9.0.crate 27627 BLAKE2B e7e1c74815b965e9cec1cd37cc3dca76671168feb689620d44d5e635f3a5fa92a7276cb3022f25a9512ffbaaa11b0a8719cc1b838a7dacda71a5beb1a992ecc0 SHA512 8ce429ba2bae53cfdaf8a7d6bf980e10b9dd515446ef3ed4e4e11432043a18e09454260567419818f523bc589fc367194bc345660f2cc808d281db235d3e0b54 +DIST itoa-1.0.9.crate 10492 BLAKE2B 0d5acef9ae72d3f4b5a387d231952e6025def69da81d38269b4882bc534be7acadc073e526fd8bebdca898a98b2c741735c541e0b6a35ed0f8f8799b906b65b1 SHA512 95f7906edb7d6a2690389167f8c4d01bc37827205bca87d527f2eb33722419ed2f2e8afaa559cc5a0a7e7fac76515c9c44c71c42b536aa34b0e2858c40946b6d +DIST libc-0.2.150.crate 719359 BLAKE2B d08e17fb29992c76337bb5862cbc1cdaf7b9d7749cd65021f145fcf49fa7954d6251c8c2f3c9a796b46283c3bc014bccfd259ea52824459841911ad847fd7f5a SHA512 7ae8fe6a1db38ac6d951c0b4880d25a02f064f5e61d6057c20f7208dec8395d58efd085e41857bcf5f4da2b014d2952dc4ddaf18ac4acd3a23675bb659e70385 +DIST link-cplusplus-1.0.9.crate 7484 BLAKE2B 4f73807068243aa0dc4b6773c5446fc988154669eb196afca19fe39ffe63627ee705c4ee3cf9cca9628d0bb8fc4cdeb7ef52b41bab810d12721a6ad53d9557ee SHA512 30697093b54ca449135d7a2a963bdd9af61a446472b0f245c87a05bd6eefa62eeebf9cc58cf17aa77ac5f2301b05ae27d13eb50d92ec58fec27303f865261170 +DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8 +DIST pdns-recursor-5.0.2.tar.bz2 1688010 BLAKE2B 29277fff79a73379299b5630b5cf546c091149413e80337e70abd4f470fcb4242d6853880dddd9968826675336322e1e55fbbcc4be6fe5bee124acbfe1ea6ac1 SHA512 d443de7e6889598a4b2c33fac5ebb1b00516ad109f139c216b0a55694a882ca78e5e9fa0f4e39f08ead96c53e28bd92c1f6aea6e051e5b8aa1c876c1ce28e9f8 +DIST pdns-recursor-5.0.3.tar.bz2 1682741 BLAKE2B a8301927194c91180da3c669c975b82212b581cde45197e4d60486f50269156382ce911fb43f86dd98d34ae3e4df1d5578e1b981cec2495611b8d8e09533901a SHA512 9e7ece25e05729e4e46023c5b7e524f46e9806cd6546bcdde9c01c038f6d53380184423e3f4c9239eaba94157d5fc53c3376225e75b4136d508dafdc1ad4e04b +DIST proc-macro2-1.0.69.crate 44271 BLAKE2B 9d1531a0b123e6238363d574bee03ad050454b65710b9800c12597f3a9ae2f9bf50c617da0472b7ac0b549afaca19c546ccd6519e648598500efda9c0db2ef6d SHA512 d197cbe9b6100c3193a01fd7dd6b4e49d440290012ababb5d9f139409f0afe816f213d67a03abeb1f3227228e0a1f2446d1dc0a2775363a15d1237c38b45d6a1 +DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c +DIST ryu-1.0.15.crate 46906 BLAKE2B 6d6949e43aaa27fba0ec6002fa11ba859af8d867f87c90d88413267186abbf6302b817985bca3d577ab3fab2e319e11756f144473a16330dfd8fc7b604cdc4b3 SHA512 4655b5647f919082a9b84b889539ae7fb23a1201057cf280efe79c58cb5f040864efb7812cda5021bf6d34838a15d173ac8bdb0fb9fa2dba85173d3efa5a826b +DIST scratch-1.0.7.crate 7997 BLAKE2B cb92a93751d209c68cd003792e45365d186138a115b936f190ad22b33f87c1e1aea2bcd20937188ba496cbe709539bf5fc1d73c0760020e5159121e88c82aed8 SHA512 2cdd160a89844101b62b4d6c23a56d3f9089828b8914031ca973bcbdeffba41ee7d9fb2edb0736d5f8e19d3bf2b1491e8451ae8fe2525518939b2f5cc6310d55 +DIST serde-1.0.192.crate 76866 BLAKE2B 4920089921e23bbc9180d413cff34277683db1881d7e65c5fd9dc8bad2beae954d2429c9c2049b3e98bc04314ef059e59562c936d6c767681e75b84aa0a2a468 SHA512 b34cea6034a14a6785b3023d0a1c2cb5b1c2756c28f02ea20ba62a657ba54e9d04096a54c4fdde3ff4094913dba46c99713828de4287186bf9dd3f7d89dda0c3 +DIST serde_derive-1.0.192.crate 55690 BLAKE2B 1e9706fdf38880989cf907c36d1f72b5b211fc6f263a4ee35d5f7106aea0a792fd79a3361d09f831e06ce0a43680647952a8478bd1001f617d2571be428b5516 SHA512 67ad208291c8d7063adce4bface5d963488c43a326e77a89970f86f65e8f77856e173d134718f64eb80dce67283df1951022c12300dea0b4d9570fb7f637643a +DIST serde_yaml-0.9.27.crate 64781 BLAKE2B 071d9ec686e0fd029cda986c14a6156c617e64b94ca9f7608c6306fbe426e07dee6231504f346d53b658395812b0fe32d74a103fc1b361e642949474211df41e SHA512 661b6a796caa3da6fabc3b24e798f9608c97706d49f64f05b8e046d40fd7c5e60ac66c3a88d399fdcd7eb2c71f3b6cec0104bdaf46870404e938b08fd55c7ea5 +DIST syn-2.0.39.crate 244129 BLAKE2B 2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01 SHA512 96cc347cfdb0f9ca0b6c7289279a1cad8fc401625783742292564f7ceca8237ced8d9a3f62069696f6132ed06092dff2baaf4be09ef53b21260d93785b0e27c3 +DIST termcolor-1.4.0.crate 18765 BLAKE2B d7286fcc84843296e2edf074e316ee8fcceb018c08deda7f1048e38108bf1a7c5f6b90dd3150078c413322eda08a1c58300b4adb963d9f51f307ecd08b5b7e10 SHA512 36c8550fe85cb90c4fdd1a6e3f60b42b6c71f65b6128da97d5ad6aac8350d907410899ad4a47bb4dc72ea6d00bc69e5a1ccc80ee9b0e80a1a27912e233f3e416 +DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920 +DIST unicode-width-0.1.11.crate 19187 BLAKE2B 6baf7f3b32eb838925e591792abfe11968206d177facefb89ef51daf44c18f3fef1e41c19a47b88b81be50667af626af2024ccc540b240fb6e1d83fdea57076f SHA512 ee06f4144525424327a17578642565f396802f0eea539b3bebc8d9627376a8bc6c5376d83a6ee577068e99fe75815bd765e6d49fb9ab9b253d00594bb15a5ffe +DIST unsafe-libyaml-0.2.9.crate 60812 BLAKE2B 2fc475191d1285344e06a7056503bb994acf3bcd19fc5692a61cbf2315b2a331a0ed7d30d50c112cf05fa41f6f71b0b8235e15bb936848497bee85592f6ddc3d SHA512 31e803c321475364c6df65cec149a044bf7941379e9e66f47a698ab324eef0b1a3c32092ccf060e73a350b4c87e4e8bd908a1ad0cccf7b75fd86da679300663e +DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 +DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 +DIST winapi-util-0.1.6.crate 12234 BLAKE2B b8db8ec9d7ada5532a22a2d070320174c32ece1f48890e9b028708e194fe72a04287b11910dc2ddc7f9c9674a9d8d39449b3e100725e1f59e59e3047a7e3650b SHA512 b1c949f9bcd34c1949a9d3a7bde6ce62fcf3d2cb66df60af41fe67a9d1acb24e571cdd5ac721be9f1ee4b3af5ef5149b5724ad6e02b558e124ef2a4412d12db9 +DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.6.1-parseACL.patch b/net-dns/pdns-recursor/files/pdns-recursor-4.6.1-parseACL.patch deleted file mode 100644 index 594fc8eca609..000000000000 --- a/net-dns/pdns-recursor/files/pdns-recursor-4.6.1-parseACL.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/pdns_recursor.cc w/pdns_recursor.cc -index 1700a9fde..ed09f2680 100644 ---- i/pdns_recursor.cc -+++ w/pdns_recursor.cc -@@ -4844,7 +4844,7 @@ void parseACLs() - - auto allowFrom = parseACL("allow-from-file", "allow-from"); - -- if(allowFrom->size() == 0) { -+ if(allowFrom == nullptr || allowFrom->size() == 0) { - if(::arg()["local-address"]!="127.0.0.1" && ::arg().asNum("local-port")==53) - g_log<<Logger::Warning<<"WARNING: Allowing queries from all IP addresses - this can be a security risk!"<<endl; - allowFrom = nullptr; diff --git a/net-dns/pdns-recursor/files/pdns-recursor-4.6.2-parseACL.patch b/net-dns/pdns-recursor/files/pdns-recursor-4.6.2-parseACL.patch deleted file mode 100644 index ee58e055f09a..000000000000 --- a/net-dns/pdns-recursor/files/pdns-recursor-4.6.2-parseACL.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/pdns_recursor.cc -+++ b/pdns_recursor.cc -@@ -4775,8 +4775,6 @@ static std::shared_ptr<NetmaskGroup> parseACL(const std::string& aclFile, const - result->addMask(line); - } - g_log<<Logger::Info<<"Done parsing "<<result->size()<<" "<<aclSetting<<" ranges from file '"<<::arg()[aclFile]<<"' - overriding '"<<aclSetting<<"' setting"<<endl; -- -- return result; - } - else if(!::arg()[aclSetting].empty()) { - vector<string> ips; -@@ -4790,11 +4788,9 @@ static std::shared_ptr<NetmaskGroup> parseACL(const std::string& aclFile, const - g_log<<Logger::Info<<*i; - } - g_log<<Logger::Info<<endl; -- -- return result; - } - -- return nullptr; -+ return result; - } - - void parseACLs() diff --git a/net-dns/pdns-recursor/pdns-recursor-4.6.2.ebuild b/net-dns/pdns-recursor/pdns-recursor-4.6.2.ebuild deleted file mode 100644 index fff451a76927..000000000000 --- a/net-dns/pdns-recursor/pdns-recursor-4.6.2.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..4} luajit ) - -inherit flag-o-matic lua-single - -DESCRIPTION="The PowerDNS Recursor" -HOMEPAGE="https://www.powerdns.com/" -SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="debug dnstap snmp sodium systemd test" -REQUIRED_USE="${LUA_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -DEPEND="${LUA_DEPS} - dnstap? ( dev-libs/fstrm ) - systemd? ( sys-apps/systemd:0= ) - snmp? ( net-analyzer/net-snmp ) - sodium? ( dev-libs/libsodium:= ) - elibc_glibc? ( - arm? ( >=sys-libs/glibc-2.34 ) - x86? ( >=sys-libs/glibc-2.34 ) - ) - dev-libs/openssl:= - >=dev-libs/boost-1.35:=[context]" -RDEPEND="${DEPEND} - !<net-dns/pdns-2.9.20-r1 - acct-user/pdns - acct-group/pdns" -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}"/${P/_/-} - -PATCHES=( - "${FILESDIR}"/${P}-parseACL.patch -) - -pkg_setup() { - lua-single_pkg_setup - filter-flags -ftree-vectorize - append-lfs-flags - append-cppflags -D_TIME_BITS=64 -} - -src_configure() { - econf \ - --sysconfdir=/etc/powerdns \ - --with-nod-cache-dir=/var/lib/powerdns \ - --with-service-user=pdns \ - --with-service-group=pdns \ - --with-lua="${ELUA}" \ - $(use_enable debug verbose-logging) \ - $(use_enable systemd) \ - $(use_enable dnstap dnstap) \ - $(use_enable test unit-tests) \ - $(use_with sodium libsodium) \ - $(use_with snmp net-snmp) -} - -src_install() { - default - - mv "${D}"/etc/powerdns/recursor.conf{-dist,} - - # set defaults: setuid=nobody, setgid=nobody - sed -i \ - -e 's/^# set\([ug]\)id=$/set\1id=pdns/' \ - -e 's/^# quiet=$/quiet=on/' \ - -e 's/^# chroot=$/chroot=\/var\/lib\/powerdns/' \ - "${D}"/etc/powerdns/recursor.conf - - newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor -} - -pkg_postinst() { - local old - - for old in ${REPLACING_VERSIONS}; do - ver_test ${old} -lt 4.0.0-r1 || continue - - ewarn "Starting with 4.0.0-r1 the init script has been renamed from precursor" - ewarn "to pdns-recursor, please update your runlevels accordingly." - - break - done -} diff --git a/net-dns/pdns-recursor/pdns-recursor-4.6.1.ebuild b/net-dns/pdns-recursor/pdns-recursor-5.0.2.ebuild index 174f5e949b3f..e244974c1501 100644 --- a/net-dns/pdns-recursor/pdns-recursor-4.6.1.ebuild +++ b/net-dns/pdns-recursor/pdns-recursor-5.0.2.ebuild @@ -1,20 +1,53 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="8" LUA_COMPAT=( lua5-{1..4} luajit ) -inherit flag-o-matic lua-single +CRATES=" + cc@1.0.84 + codespan-reporting@0.11.1 + cxx-build@1.0.110 + cxx@1.0.110 + cxxbridge-flags@1.0.110 + cxxbridge-macro@1.0.110 + equivalent@1.0.1 + hashbrown@0.14.2 + indexmap@2.1.0 + ipnet@2.9.0 + itoa@1.0.9 + libc@0.2.150 + link-cplusplus@1.0.9 + once_cell@1.18.0 + proc-macro2@1.0.69 + quote@1.0.33 + ryu@1.0.15 + scratch@1.0.7 + serde@1.0.192 + serde_derive@1.0.192 + serde_yaml@0.9.27 + syn@2.0.39 + termcolor@1.4.0 + unicode-ident@1.0.12 + unicode-width@0.1.11 + unsafe-libyaml@0.2.9 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.6 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 +" + +inherit cargo flag-o-matic lua-single DESCRIPTION="The PowerDNS Recursor" HOMEPAGE="https://www.powerdns.com/" -SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2" +SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2 ${CARGO_CRATE_URIS}" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~arm x86" -IUSE="debug dnstap snmp sodium systemd test" +IUSE="debug dnstap snmp sodium systemd test valgrind" REQUIRED_USE="${LUA_REQUIRED_USE}" RESTRICT="!test? ( test )" @@ -28,11 +61,13 @@ DEPEND="${LUA_DEPS} x86? ( >=sys-libs/glibc-2.34 ) ) dev-libs/openssl:= - >=dev-libs/boost-1.35:=" + dev-libs/boost:=[context]" RDEPEND="${DEPEND} !<net-dns/pdns-2.9.20-r1 acct-user/pdns acct-group/pdns" +DEPEND="${DEPEND} + valgrind? ( dev-debug/valgrind )" BDEPEND="virtual/pkgconfig" S="${WORKDIR}"/${P/_/-} @@ -55,10 +90,15 @@ src_configure() { $(use_enable systemd) \ $(use_enable dnstap dnstap) \ $(use_enable test unit-tests) \ + $(use_enable valgrind) \ $(use_with sodium libsodium) \ $(use_with snmp net-snmp) } +src_compile() { + default +} + src_install() { default @@ -74,6 +114,10 @@ src_install() { newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor } +src_test() { + default +} + pkg_postinst() { local old diff --git a/net-dns/pdns-recursor/pdns-recursor-4.6.1-r1.ebuild b/net-dns/pdns-recursor/pdns-recursor-5.0.3.ebuild index fff451a76927..35970c3ed18e 100644 --- a/net-dns/pdns-recursor/pdns-recursor-4.6.1-r1.ebuild +++ b/net-dns/pdns-recursor/pdns-recursor-5.0.3.ebuild @@ -1,20 +1,53 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="8" LUA_COMPAT=( lua5-{1..4} luajit ) -inherit flag-o-matic lua-single +CRATES=" + cc@1.0.84 + codespan-reporting@0.11.1 + cxx-build@1.0.110 + cxx@1.0.110 + cxxbridge-flags@1.0.110 + cxxbridge-macro@1.0.110 + equivalent@1.0.1 + hashbrown@0.14.2 + indexmap@2.1.0 + ipnet@2.9.0 + itoa@1.0.9 + libc@0.2.150 + link-cplusplus@1.0.9 + once_cell@1.18.0 + proc-macro2@1.0.69 + quote@1.0.33 + ryu@1.0.15 + scratch@1.0.7 + serde@1.0.192 + serde_derive@1.0.192 + serde_yaml@0.9.27 + syn@2.0.39 + termcolor@1.4.0 + unicode-ident@1.0.12 + unicode-width@0.1.11 + unsafe-libyaml@0.2.9 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.6 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 +" + +inherit cargo flag-o-matic lua-single DESCRIPTION="The PowerDNS Recursor" HOMEPAGE="https://www.powerdns.com/" -SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2" +SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2 ${CARGO_CRATE_URIS}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="debug dnstap snmp sodium systemd test" +IUSE="debug dnstap snmp sodium systemd test valgrind" REQUIRED_USE="${LUA_REQUIRED_USE}" RESTRICT="!test? ( test )" @@ -28,19 +61,17 @@ DEPEND="${LUA_DEPS} x86? ( >=sys-libs/glibc-2.34 ) ) dev-libs/openssl:= - >=dev-libs/boost-1.35:=[context]" + dev-libs/boost:=[context]" RDEPEND="${DEPEND} !<net-dns/pdns-2.9.20-r1 acct-user/pdns acct-group/pdns" +DEPEND="${DEPEND} + valgrind? ( dev-debug/valgrind )" BDEPEND="virtual/pkgconfig" S="${WORKDIR}"/${P/_/-} -PATCHES=( - "${FILESDIR}"/${P}-parseACL.patch -) - pkg_setup() { lua-single_pkg_setup filter-flags -ftree-vectorize @@ -59,10 +90,15 @@ src_configure() { $(use_enable systemd) \ $(use_enable dnstap dnstap) \ $(use_enable test unit-tests) \ + $(use_enable valgrind) \ $(use_with sodium libsodium) \ $(use_with snmp net-snmp) } +src_compile() { + default +} + src_install() { default @@ -78,6 +114,10 @@ src_install() { newinitd "${FILESDIR}"/pdns-recursor-r2 pdns-recursor } +src_test() { + default +} + pkg_postinst() { local old diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest index cce5d3bb9023..57009b3fc0a6 100644 --- a/net-dns/pdns/Manifest +++ b/net-dns/pdns/Manifest @@ -1,2 +1,2 @@ -DIST pdns-4.6.1.tar.bz2 1315530 BLAKE2B 18676fac07667215babce3687d2ed9f108cad56a3a099907feac7eb86ba771bcd6319eb687ff826c5288590e6cdf3babe6c6c867a892d290351017c5bfb10198 SHA512 02ecb4e182ac4976f9d788b351b70988ec56cc034631f482e539ec9c420bba231c4597b2f76a4b511c5aaa58ee097ad9de4e4b29b191af65eaf5033269ae7087 -DIST pdns-4.6.2.tar.bz2 1302527 BLAKE2B ff4e7f5ab0d0cd176e6c714d5bdf0b231ee05f092c91b19309b62b4d638d2fd1149e426ae98e153b1f64aca1f972f69c3475ee672936b85cc810f305ce899f90 SHA512 10e7f4338f99f063ca8d694c148d468e66dd1b9feb2cf8dba04861396addb138b9335908d666e7e2701424d1fdb3c29e40b596098f19b1443643b9e6ab356c0a +DIST pdns-4.8.4.tar.bz2 1334756 BLAKE2B b92a35ee3e76806bd24bd030428e74afae19a46333d2a444e2bb822300049f3be5afa260cbdadd435f45ba1cf160481c8ccd0bd386eeb4d2679498d650fb7bf7 SHA512 1e8ec7e5ba0c8d87d273eab866890d0fa999825f2ca50127c4337a627fb1aabc6a957608fc9e60b53d5fde8b76530dc08bda4463e62e642d9b1f74f6e097c774 +DIST pdns-4.9.0.tar.bz2 1364768 BLAKE2B a018459b250f181686d2638e4487dfd18ef1173f20798039be1f8f6e7134399bada5a9bf2aab16004026630c175f363b22d7749fdbfb0b8601699b29db1b1ed2 SHA512 73dcad9a6cc80e5ca2bdd28f1c49b1acab463ec51cb181324536a566ab26ac3a236099bd4eb03fbe98748f798ad0e11270fb8e6d52a33ea106c8dd2d97013388 diff --git a/net-dns/pdns/metadata.xml b/net-dns/pdns/metadata.xml index 19e010a78adb..1937df5091d2 100644 --- a/net-dns/pdns/metadata.xml +++ b/net-dns/pdns/metadata.xml @@ -13,7 +13,6 @@ standards documents. Furthermore, PowerDNS interfaces with almost any database. <use> <flag name="lmdb">Use LMDB as backend.</flag> <flag name="lua-records">Enable LUA records.</flag> - <flag name="mydns">Making it possible to use a MyDNS MySQL database with PowerDNS (not recommended for new deployments).</flag> <flag name="remote">Use a generic socket or pipe as a backend (via JSON RPC requests).</flag> <flag name="sodium">Use <pkg>dev-libs/libsodium</pkg> for cryptography</flag> <flag name="tinydns">Use a TinyDNS CDB database as backend.</flag> diff --git a/net-dns/pdns/pdns-4.6.2-r1.ebuild b/net-dns/pdns/pdns-4.6.2-r1.ebuild deleted file mode 100644 index a33ae91689aa..000000000000 --- a/net-dns/pdns/pdns-4.6.2-r1.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..4} luajit ) - -inherit flag-o-matic lua-single - -DESCRIPTION="The PowerDNS Daemon" -HOMEPAGE="https://www.powerdns.com/" -SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -# other possible flags: -# db2: we lack the dep -# oracle: dito (need Oracle Client Libraries) -# xdb: (almost) dead, surely not supported - -IUSE="debug doc geoip ldap lmdb lua-records mydns mysql postgres remote sodium sqlite systemd tools tinydns test" -RESTRICT="!test? ( test )" - -REQUIRED_USE="${LUA_REQUIRED_USE} - mydns? ( mysql )" - -DEPEND="${LUA_DEPS} - dev-libs/openssl:= - >=dev-libs/boost-1.35:= - lmdb? ( >=dev-db/lmdb-0.9.29 ) - lua-records? ( >=net-misc/curl-7.21.3 ) - mysql? ( dev-db/mysql-connector-c:= ) - postgres? ( dev-db/postgresql:= ) - ldap? ( >=net-nds/openldap-2.0.27-r4:= app-crypt/mit-krb5 ) - sqlite? ( dev-db/sqlite:3 ) - geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) - sodium? ( dev-libs/libsodium:= ) - tinydns? ( >=dev-db/tinycdb-0.77 ) - elibc_glibc? ( x86? ( >=sys-libs/glibc-2.34 ) )" -RDEPEND="${DEPEND} - acct-user/pdns - acct-group/pdns" - -BDEPEND="virtual/pkgconfig - doc? ( app-doc/doxygen[dot] )" - -S="${WORKDIR}"/${P/_/-} - -pkg_setup() { - lua-single_pkg_setup - append-lfs-flags - append-cppflags -D_TIME_BITS=64 -} - -src_configure() { - local dynmodules="pipe bind" # the default backends, always enabled - - #use db2 && dynmodules+=" db2" - use ldap && dynmodules+=" ldap" - use lmdb && dynmodules+=" lmdb" - use mydns && dynmodules+=" mydns" - use mysql && dynmodules+=" gmysql" - #use oracle && dynmodules+=" goracle oracle" - use postgres && dynmodules+=" gpgsql" - use remote && dynmodules+=" remote" - use sqlite && dynmodules+=" gsqlite3" - use tinydns && dynmodules+=" tinydns" - use geoip && dynmodules+=" geoip" - #use xdb && dynmodules+=" xdb" - - econf \ - --disable-static \ - --sysconfdir=/etc/powerdns \ - --libdir=/usr/$(get_libdir)/powerdns \ - --with-service-user=pdns \ - --with-service-group=pdns \ - --with-modules= \ - --with-dynmodules="${dynmodules}" \ - --with-mysql-lib=/usr/$(get_libdir) \ - --with-lua="${ELUA}" \ - $(use_enable debug verbose-logging) \ - $(use_enable lua-records) \ - $(use_enable test unit-tests) \ - $(use_enable tools) \ - $(use_enable systemd) \ - $(use_with sodium libsodium) \ - ${myconf} -} - -src_compile() { - default - use doc && emake -C codedocs codedocs -} - -src_install() { - default - - mv "${D}"/etc/powerdns/pdns.conf{-dist,} - - fperms 0700 /etc/powerdns - fperms 0600 /etc/powerdns/pdns.conf - - # set defaults: setuid=pdns, setgid=pdns - sed -i \ - -e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \ - "${D}"/etc/powerdns/pdns.conf - - newinitd "${FILESDIR}"/pdns-r1 pdns - - keepdir /var/empty - - if use doc; then - docinto html - dodoc -r codedocs/html/. - fi - - # Install development headers - insinto /usr/include/pdns - doins pdns/*.hh - insinto /usr/include/pdns/backends/gsql - doins pdns/backends/gsql/*.hh - - if use ldap ; then - insinto /etc/openldap/schema - doins "${FILESDIR}"/dnsdomain2.schema - fi - - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - elog "PowerDNS provides multiple instances support. You can create more instances" - elog "by symlinking the pdns init script to another name." - elog - elog "The name must be in the format pdns.<suffix> and PowerDNS will use the" - elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default." - - local old - for old in ${REPLACING_VERSIONS}; do - ver_test ${old} -lt 3.2 || continue - - echo - ewarn "To fix a security bug (bug #458018) had the following" - ewarn "files/directories the world-readable bit removed (if set):" - ewarn " ${EPREFIX}/etc/powerdns" - ewarn " ${EPREFIX}/etc/powerdns/pdns.conf" - ewarn "Check if this is correct for your setup" - ewarn "This is a one-time change and will not happen on subsequent updates." - chmod o-rwx "${EPREFIX}"/etc/powerdns/{,pdns.conf} - - break - done - - if use postgres; then - for old in ${REPLACING_VERSIONS}; do - ver_test ${old} -lt 4.1.11-r1 || continue - - echo - ewarn "PowerDNS 4.1.11 contains a security fix for the PostgreSQL backend." - ewarn "This security fix needs to be applied manually to the database schema." - ewarn "Please refer to the official security advisory for more information:" - ewarn - ewarn " https://doc.powerdns.com/authoritative/security-advisories/powerdns-advisory-2019-06.html" - - break - done - fi -} diff --git a/net-dns/pdns/pdns-4.6.1.ebuild b/net-dns/pdns/pdns-4.8.4.ebuild index c9114681d24b..d0fbd003fae9 100644 --- a/net-dns/pdns/pdns-4.6.1.ebuild +++ b/net-dns/pdns/pdns-4.8.4.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit flag-o-matic lua-single +inherit flag-o-matic lua-single python-any-r1 DESCRIPTION="The PowerDNS Daemon" HOMEPAGE="https://www.powerdns.com/" @@ -15,24 +16,20 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -# other possible flags: -# db2: we lack the dep -# oracle: dito (need Oracle Client Libraries) -# xdb: (almost) dead, surely not supported - -IUSE="debug doc geoip ldap lua-records mydns mysql postgres remote sodium sqlite systemd tools tinydns test" +IUSE="debug doc geoip ldap lmdb lua-records mysql odbc postgres remote sodium sqlite systemd tools tinydns test" RESTRICT="!test? ( test )" -REQUIRED_USE="${LUA_REQUIRED_USE} - mydns? ( mysql )" +REQUIRED_USE="${LUA_REQUIRED_USE}" DEPEND="${LUA_DEPS} dev-libs/openssl:= - >=dev-libs/boost-1.35:= + dev-libs/boost:= + lmdb? ( >=dev-db/lmdb-0.9.29 ) lua-records? ( >=net-misc/curl-7.21.3 ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4:= app-crypt/mit-krb5 ) + odbc? ( dev-db/unixODBC ) sqlite? ( dev-db/sqlite:3 ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) @@ -42,31 +39,31 @@ RDEPEND="${DEPEND} acct-user/pdns acct-group/pdns" -BDEPEND="virtual/pkgconfig - doc? ( app-doc/doxygen[dot] )" +BDEPEND="${PYTHON_DEPS} + virtual/pkgconfig + doc? ( app-text/doxygen[dot] )" S="${WORKDIR}"/${P/_/-} pkg_setup() { lua-single_pkg_setup + python-any-r1_pkg_setup append-lfs-flags append-cppflags -D_TIME_BITS=64 } src_configure() { - local dynmodules="pipe bind" # the default backends, always enabled - - #use db2 && dynmodules+=" db2" - use ldap && dynmodules+=" ldap" - use mydns && dynmodules+=" mydns" - use mysql && dynmodules+=" gmysql" - #use oracle && dynmodules+=" goracle oracle" - use postgres && dynmodules+=" gpgsql" - use remote && dynmodules+=" remote" - use sqlite && dynmodules+=" gsqlite3" - use tinydns && dynmodules+=" tinydns" - use geoip && dynmodules+=" geoip" - #use xdb && dynmodules+=" xdb" + local cnf_dynmodules="bind lua2 pipe" # the default backends, always enabled + + use geoip && cnf_dynmodules+=" geoip" + use ldap && cnf_dynmodules+=" ldap" + use lmdb && cnf_dynmodules+=" lmdb" + use mysql && cnf_dynmodules+=" gmysql" + use odbc && cnf_dynmodules+=" godbc" + use postgres && cnf_dynmodules+=" gpgsql" + use remote && cnf_dynmodules+=" remote" + use sqlite && cnf_dynmodules+=" gsqlite3" + use tinydns && cnf_dynmodules+=" tinydns" econf \ --disable-static \ @@ -75,7 +72,7 @@ src_configure() { --with-service-user=pdns \ --with-service-group=pdns \ --with-modules= \ - --with-dynmodules="${dynmodules}" \ + --with-dynmodules="${cnf_dynmodules}" \ --with-mysql-lib=/usr/$(get_libdir) \ --with-lua="${ELUA}" \ $(use_enable debug verbose-logging) \ diff --git a/net-dns/pdns/pdns-4.6.2.ebuild b/net-dns/pdns/pdns-4.9.0.ebuild index 6031548b05ba..278cba886e04 100644 --- a/net-dns/pdns/pdns-4.6.2.ebuild +++ b/net-dns/pdns/pdns-4.9.0.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit flag-o-matic lua-single +inherit flag-o-matic lua-single python-any-r1 DESCRIPTION="The PowerDNS Daemon" HOMEPAGE="https://www.powerdns.com/" @@ -15,24 +16,20 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -# other possible flags: -# db2: we lack the dep -# oracle: dito (need Oracle Client Libraries) -# xdb: (almost) dead, surely not supported - -IUSE="debug doc geoip ldap lua-records mydns mysql postgres remote sodium sqlite systemd tools tinydns test" +IUSE="debug doc geoip ldap lmdb lua-records mysql odbc postgres remote sodium sqlite systemd tools tinydns test" RESTRICT="!test? ( test )" -REQUIRED_USE="${LUA_REQUIRED_USE} - mydns? ( mysql )" +REQUIRED_USE="${LUA_REQUIRED_USE}" DEPEND="${LUA_DEPS} dev-libs/openssl:= - >=dev-libs/boost-1.35:= + dev-libs/boost:= + lmdb? ( >=dev-db/lmdb-0.9.29 ) lua-records? ( >=net-misc/curl-7.21.3 ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) ldap? ( >=net-nds/openldap-2.0.27-r4:= app-crypt/mit-krb5 ) + odbc? ( dev-db/unixODBC ) sqlite? ( dev-db/sqlite:3 ) geoip? ( >=dev-cpp/yaml-cpp-0.5.1:= dev-libs/geoip ) sodium? ( dev-libs/libsodium:= ) @@ -42,31 +39,31 @@ RDEPEND="${DEPEND} acct-user/pdns acct-group/pdns" -BDEPEND="virtual/pkgconfig - doc? ( app-doc/doxygen[dot] )" +BDEPEND="${PYTHON_DEPS} + virtual/pkgconfig + doc? ( app-text/doxygen[dot] )" S="${WORKDIR}"/${P/_/-} pkg_setup() { lua-single_pkg_setup + python-any-r1_pkg_setup append-lfs-flags append-cppflags -D_TIME_BITS=64 } src_configure() { - local dynmodules="pipe bind" # the default backends, always enabled - - #use db2 && dynmodules+=" db2" - use ldap && dynmodules+=" ldap" - use mydns && dynmodules+=" mydns" - use mysql && dynmodules+=" gmysql" - #use oracle && dynmodules+=" goracle oracle" - use postgres && dynmodules+=" gpgsql" - use remote && dynmodules+=" remote" - use sqlite && dynmodules+=" gsqlite3" - use tinydns && dynmodules+=" tinydns" - use geoip && dynmodules+=" geoip" - #use xdb && dynmodules+=" xdb" + local cnf_dynmodules="bind lua2 pipe" # the default backends, always enabled + + use geoip && cnf_dynmodules+=" geoip" + use ldap && cnf_dynmodules+=" ldap" + use lmdb && cnf_dynmodules+=" lmdb" + use mysql && cnf_dynmodules+=" gmysql" + use odbc && cnf_dynmodules+=" godbc" + use postgres && cnf_dynmodules+=" gpgsql" + use remote && cnf_dynmodules+=" remote" + use sqlite && cnf_dynmodules+=" gsqlite3" + use tinydns && cnf_dynmodules+=" tinydns" econf \ --disable-static \ @@ -75,7 +72,7 @@ src_configure() { --with-service-user=pdns \ --with-service-group=pdns \ --with-modules= \ - --with-dynmodules="${dynmodules}" \ + --with-dynmodules="${cnf_dynmodules}" \ --with-mysql-lib=/usr/$(get_libdir) \ --with-lua="${ELUA}" \ $(use_enable debug verbose-logging) \ diff --git a/net-dns/pdnsd/metadata.xml b/net-dns/pdnsd/metadata.xml index f6e8507bf297..8b6503c6dd29 100644 --- a/net-dns/pdnsd/metadata.xml +++ b/net-dns/pdnsd/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> - </maintainer> + <!-- maintainer-needed --> <longdescription> A proxy DNS server with permanent caching (the cache contents are written to hard disk on exit) that is designed to cope with diff --git a/net-dns/rbldnsd/files/rbldnsd-0.998b-cstd.patch b/net-dns/rbldnsd/files/rbldnsd-0.998b-cstd.patch new file mode 100644 index 000000000000..e5e17e334b05 --- /dev/null +++ b/net-dns/rbldnsd/files/rbldnsd-0.998b-cstd.patch @@ -0,0 +1,193 @@ +From c1f9d0a5d112d2298ed4f3c696ea34c9b0c24ba6 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Fri, 16 Feb 2024 07:43:54 -0500 +Subject: [PATCH 1/1] configure{,.lib},rbldnsd_util.c: future proof the + ./configure script + +https://github.com/spamhaus/rbldnsd/pull/28 +--- + configure | 38 ++++++++++++++++++++++---------------- + configure.lib | 2 +- + rbldnsd_util.c | 4 ++-- + 3 files changed, 25 insertions(+), 19 deletions(-) + +diff --git a/configure b/configure +index b0cb655..6470c9e 100755 +--- a/configure ++++ b/configure +@@ -90,7 +90,7 @@ else + if ac_yesno "sizes of standard integer types" \ + ac_compile_run <<EOF + #include <stdio.h> +-int main() { ++int main(int argc, char **argv) { + printf("#define SIZEOF_SHORT %d\n", sizeof(short)); + printf("#define SIZEOF_INT %d\n", sizeof(int)); + printf("#define SIZEOF_LONG %d\n", sizeof(long)); +@@ -105,7 +105,7 @@ EOF + if ac_yesno "for long long" \ + ac_compile_run <<EOF + #include <stdio.h> +-int main() { ++int main(int argc, char **argv) { + long long x; + printf("#define SIZEOF_LONG_LONG %d\n", sizeof(long long)); + return 0; +@@ -120,7 +120,7 @@ fi + + if ac_compile_run_v "whether C compiler defines __SIZEOF_POINTER__" <<EOF + #include <stdio.h> +-int main() { ++int main(int argc, char **argv) { + #ifdef __SIZEOF_POINTER__ + return 0; + #else +@@ -136,7 +136,7 @@ fi + + if ac_verbose "byte order" "big-endian" "little-endian" \ + ac_compile_run <<EOF +-int main() { ++int main(int argc, char **argv) { + long one = 1; + if (*(char *)&one) + return 1; /* little-endian */ +@@ -150,8 +150,8 @@ fi + has_inline= + for c in inline __inline; do + if ac_compile_v "for $c" <<EOF +-static $c int foo() { return 0; } +-int main() { return foo(); } ++static $c int foo(void) { return 0; } ++int main(int argc, char **argv) { return foo(); } + EOF + then + has_inline=$c +@@ -165,7 +165,7 @@ fi + if ac_compile_v "for socklen_t" <<EOF + #include <sys/types.h> + #include <sys/socket.h> +-int foo() { socklen_t len; len = 0; return len; } ++int foo(void) { socklen_t len; len = 0; return len; } + EOF + then : + else +@@ -173,7 +173,13 @@ else + fi + + if ac_library_find_v 'connect()' "" "-lsocket -lnsl" <<EOF +-int main() { gethostbyname(); connect(); return 0; } ++#include <netdb.h> ++#include <sys/socket.h> ++int main(int argc, char **argv) { ++ gethostbyname(""); ++ connect(0, (const struct sockaddr *)0, (socklen_t)0); ++ return 0; ++} + EOF + then : + else +@@ -189,7 +195,7 @@ if ac_link_v "for IPv6" <<EOF + #include <sys/socket.h> + #include <netinet/in.h> + #include <netdb.h> +-int main() { ++int main(int argc, char **argv) { + char h[200]; + char s[200]; + struct sockaddr_in6 sa; +@@ -211,7 +217,7 @@ if ac_link_v "for mallinfo()" <<EOF + #include <sys/types.h> + #include <stdlib.h> + #include <malloc.h> +-int main() { ++int main(int argc, char **argv) { + struct mallinfo mi = mallinfo(); + return 0; + } +@@ -224,7 +230,7 @@ fi + if ac_link_v "for poll()" <<EOF + #include <sys/types.h> + #include <sys/poll.h> +-int main() { ++int main(int argc, char **argv) { + struct pollfd pfd[2]; + return poll(pfd, 2, 10); + } +@@ -251,7 +257,7 @@ int test(char *fmt, ...) { + vsnprintf(buf, sizeof(buf), fmt, ap); + return 0; + } +-int main() { ++int main(int argc, char **argv) { + test("test%d", 40); + return 0; + } +@@ -265,7 +271,7 @@ if ac_link_v "for writev()/readv()" <<EOF + #include <sys/types.h> + #include <unistd.h> + #include <sys/uio.h> +-int main() { ++int main(int argc, char **argv) { + struct iovec iov; + return writev(1, &iov, 1) && readv(1, &iov, 1); + } +@@ -278,7 +284,7 @@ fi + if ac_link_v "for setitimer()" <<EOF + #include <sys/types.h> + #include <sys/time.h> +-int main() { ++int main(int argc, char **argv) { + struct itimerval itv; + itv.it_interval.tv_sec = itv.it_value.tv_sec = 10; + itv.it_interval.tv_usec = itv.it_value.tv_usec = 20; +@@ -296,7 +302,7 @@ elif ac_link_v "for zlib support" -lz <<EOF + #include <sys/types.h> + #include <stdio.h> + #include <zlib.h> +-int main() { ++int main(int argc, char **argv) { + z_stream z; + int r; + r = inflateInit2(&z, 0); +@@ -319,7 +325,7 @@ elif [ n = "$enable_dso" ]; then + echo "#define NO_DSO 1 /* option disabled */" >>confdef.h + elif ac_link_v "for dlopen() in -dl with -rdynamic" -ldl -rdynamic <<EOF + #include <dlfcn.h> +-int main() { ++int main(int argc, char **argv) { + void *handle, *func; + handle = dlopen("testfile", RTLD_NOW); + func = dlsym(handle, "function"); +diff --git a/configure.lib b/configure.lib +index 39cf423..6b7245f 100644 +--- a/configure.lib ++++ b/configure.lib +@@ -178,7 +178,7 @@ EOF + if ac_yesno "whether the C compiler ($ccld) + can produce executables" \ + ac_compile_run <<EOF +-int main() { return 0; } ++int main(int argc, char **argv) { return 0; } + EOF + then : + else +diff --git a/rbldnsd_util.c b/rbldnsd_util.c +index c6d628d..1402a67 100644 +--- a/rbldnsd_util.c ++++ b/rbldnsd_util.c +@@ -50,10 +50,10 @@ char *parse_time(char *s, unsigned *tp) { + case 'w': case 'W': m *= 7; /* week */ + case 'd': case 'D': m *= 24; /* day */ + case 'h': case 'H': m *= 60; /* hours */ +- case 'm': case 'M': m *= 60; /* minues */ ++ case 'm': case 'M': m *= 60; /* minutes */ + if (0xffffffffu / m < *tp) return NULL; + *tp *= m; +- case 's': case 'S': /* secounds */ ++ case 's': case 'S': /* seconds */ + ++s; + break; + } +-- +2.43.0 + diff --git a/net-dns/rbldnsd/files/rbldnsd-0.998b-mallinfo2.patch b/net-dns/rbldnsd/files/rbldnsd-0.998b-mallinfo2.patch new file mode 100644 index 000000000000..8ce5cb11afa6 --- /dev/null +++ b/net-dns/rbldnsd/files/rbldnsd-0.998b-mallinfo2.patch @@ -0,0 +1,59 @@ +From 43e23bf396751cf92252cfef031d4cab2a2fe792 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Fri, 16 Feb 2024 07:38:20 -0500 +Subject: [PATCH 2/2] configure,rbldnsd.c: replace mallinfo() with mallinfo2() + +The mallinfo() function from malloc.h is deprecated, and has been +replaced by mallinfo2(). Additionally, the "mallinfo" struct that it +returns has been replaced by a "mallinfo2" struct. The only difference +between the two is that the newer struct contains members of type +size_t rather than int, which proved to be too small (leading to +overflows). + +The call to ssprintf() that prints this information has been updated +to use the "z" length modifier, which is C99, but which is probably +safe by now. Other C99 features are already being used by rbldnsd. +--- + configure | 4 ++-- + rbldnsd.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 5686b0a..42fcf9a 100755 +--- a/configure ++++ b/configure +@@ -213,12 +213,12 @@ else + fi + fi # enable_ipv6? + +-if ac_link_v "for mallinfo()" <<EOF ++if ac_link_v "for mallinfo2()" <<EOF + #include <sys/types.h> + #include <stdlib.h> + #include <malloc.h> + int main(int argc, char **argv) { +- struct mallinfo mi = mallinfo(); ++ struct mallinfo2 mi = mallinfo2(); + return 0; + } + EOF +diff --git a/rbldnsd.c b/rbldnsd.c +index 8ea25a2..d0cb43e 100644 +--- a/rbldnsd.c ++++ b/rbldnsd.c +@@ -951,10 +951,10 @@ static int do_reload(int do_fork) { + #endif /* NO_TIMES */ + #ifndef NO_MEMINFO + { +- struct mallinfo mi = mallinfo(); ++ struct mallinfo2 mi = mallinfo2(); + # define kb(x) ((mi.x + 512)>>10) + ip += ssprintf(ibuf + ip, sizeof(ibuf) - ip, +- ", mem arena=%d free=%d mmap=%d Kb", ++ ", mem arena=%zd free=%zd mmap=%zd Kb", + kb(arena), kb(fordblks), kb(hblkhd)); + # undef kb + } +-- +2.43.0 + diff --git a/net-dns/rbldnsd/files/rbldnsd-0.998b-sys-poll.patch b/net-dns/rbldnsd/files/rbldnsd-0.998b-sys-poll.patch new file mode 100644 index 000000000000..ccf53d7e8072 --- /dev/null +++ b/net-dns/rbldnsd/files/rbldnsd-0.998b-sys-poll.patch @@ -0,0 +1,54 @@ +From 9a4eeaec16ebd7e5a493fe0a10c371b60ecf813c Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Fri, 16 Feb 2024 07:36:24 -0500 +Subject: [PATCH 1/2] configure,rbldnsd.c: include <poll.h> instead of + <sys/poll.h> + +As far back as 1997, the Single UNIX Specification (that later became +POSIX) has said that <poll.h> is the file that provides poll() and +friends: + + https://pubs.opengroup.org/onlinepubs/7908799/xsh/poll.h.html + +Most implementations also support the old <sys/poll.h>, but musl, for +example, raises a warning about its usage: + + https://git.musl-libc.org/cgit/musl/tree/include/sys/poll.h + +This commit updates <sys/poll.h> to <poll.h> in two places. + +Closes: https://github.com/spamhaus/rbldnsd/issues/25 +--- + configure | 2 +- + rbldnsd.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 6470c9e..5686b0a 100755 +--- a/configure ++++ b/configure +@@ -229,7 +229,7 @@ fi + + if ac_link_v "for poll()" <<EOF + #include <sys/types.h> +-#include <sys/poll.h> ++#include <poll.h> + int main(int argc, char **argv) { + struct pollfd pfd[2]; + return poll(pfd, 2, 10); +diff --git a/rbldnsd.c b/rbldnsd.c +index e791231..8ea25a2 100644 +--- a/rbldnsd.c ++++ b/rbldnsd.c +@@ -27,7 +27,7 @@ + # include <sys/select.h> + #endif + #ifndef NO_POLL +-# include <sys/poll.h> ++# include <poll.h> + #endif + #ifndef NO_MEMINFO + # include <malloc.h> +-- +2.43.0 + diff --git a/net-dns/rbldnsd/metadata.xml b/net-dns/rbldnsd/metadata.xml index 949be0fd7263..0b42c0e0d6ab 100644 --- a/net-dns/rbldnsd/metadata.xml +++ b/net-dns/rbldnsd/metadata.xml @@ -5,6 +5,12 @@ <email>mjo@gentoo.org</email> <name>Michael Orlitzky</name> </maintainer> + <use> + <!-- leave this global flag defined here to avoid a pkgcheck warning --> + <flag name="ipv6"> + Support listening on ipv6 addresses and ipv6 database entries. + </flag> + </use> <longdescription lang="en"> rbldnsd is a small and fast DNS daemon which is especially made to diff --git a/net-dns/rbldnsd/rbldnsd-0.998b-r2.ebuild b/net-dns/rbldnsd/rbldnsd-0.998b-r3.ebuild index 2f619e646646..dc064757882e 100644 --- a/net-dns/rbldnsd/rbldnsd-0.998b-r2.ebuild +++ b/net-dns/rbldnsd/rbldnsd-0.998b-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs @@ -25,6 +25,18 @@ BDEPEND=" # python-2.7, and it will crash if you try to run it now. RESTRICT=test +# This check properly includes malloc.h; if mallinfo2 +# is "implicitly defined," then it's not there. +QA_CONFIG_IMPL_DECL_SKIP=( + mallinfo2 +) + +PATCHES=( + "${FILESDIR}/rbldnsd-0.998b-cstd.patch" + "${FILESDIR}/rbldnsd-0.998b-sys-poll.patch" + "${FILESDIR}/rbldnsd-0.998b-mallinfo2.patch" +) + src_configure() { # The ./configure file is handwritten and doesn't support a `make # install` target, so there are no --prefix options. The econf diff --git a/net-dns/resolv_wrapper/Manifest b/net-dns/resolv_wrapper/Manifest index 5d399b55760b..1ed034397078 100644 --- a/net-dns/resolv_wrapper/Manifest +++ b/net-dns/resolv_wrapper/Manifest @@ -1 +1 @@ -DIST resolv_wrapper-1.1.7.tar.gz 45148 BLAKE2B d1b860187bfa3be6eadd848abc458d5c9e3c4c4048a70b37d7548caf2604bda51f8a3606487fb95d682ab39e06f63f29b85de981ae32527997799fa5d72befab SHA512 531a7734f40d8a7cb3da4618eebbb4530657ad2cdcf3c1cd48f3ae1dcf55fc003205e44745fc3f70704060ae0c6a2516919c61fd10223ff56d90a47a3c59b3c0 +DIST resolv_wrapper-1.1.8.tar.gz 38051 BLAKE2B f9f4dee2d83a66d4efe911b9fc55ff1e06ad13fc876652416ce2c0cfa877d1be6b590bd322ad6b642a30a8d352bb3148ee79b5c1999b7ceedd338b711239cc34 SHA512 64cb722b3530b5669de1eba379ca4a577b505ac4be624d63a3988b16df2e3082489f48db099cba256dded9483ae913144b9a5c0c6e01af20da0709bd79c461c4 diff --git a/net-dns/resolv_wrapper/files/resolv_wrapper-1.1.8-cmocka-cmake.patch b/net-dns/resolv_wrapper/files/resolv_wrapper-1.1.8-cmocka-cmake.patch new file mode 100644 index 000000000000..23f1577ed99b --- /dev/null +++ b/net-dns/resolv_wrapper/files/resolv_wrapper-1.1.8-cmocka-cmake.patch @@ -0,0 +1,26 @@ +https://git.samba.org/?p=resolv_wrapper.git;a=commit;h=f2e7f58025ecb4cf399494166abea01813b1d0f0 + +From f2e7f58025ecb4cf399494166abea01813b1d0f0 Mon Sep 17 00:00:00 2001 +From: Andreas Schneider <asn@samba.org> +Date: Fri, 17 Feb 2023 17:51:27 +0100 +Subject: [PATCH] cmake: Fix cmocka >= 1.1.6 find_package() in CONFIG mode +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas Schneider <asn@samba.org> +Reviewed-by: Pavel Filipenský <pfilipensky@samba.org> +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -1,5 +1,9 @@ + project(tests C) + ++if (TARGET cmocka::cmocka) ++ set(CMOCKA_LIBRARY cmocka::cmocka) ++endif() ++ + set(TORTURE_LIBRARY torture) + + # A simple DNS server for testing +-- +2.34.1 diff --git a/net-dns/resolv_wrapper/resolv_wrapper-1.1.7.ebuild b/net-dns/resolv_wrapper/resolv_wrapper-1.1.8.ebuild index ce3c953062df..119dd3c0a227 100644 --- a/net-dns/resolv_wrapper/resolv_wrapper-1.1.7.ebuild +++ b/net-dns/resolv_wrapper/resolv_wrapper-1.1.8.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -CMAKE_ECLASS=cmake inherit cmake-multilib DESCRIPTION="Wrapper for DNS name resolving or DNS faking" @@ -16,12 +15,18 @@ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="test" RESTRICT="!test? ( test )" -BDEPEND="test? ( +BDEPEND=" + test? ( dev-util/cmocka net-libs/socket_wrapper - )" + ) +" + +PATCHES=( + "${FILESDIR}"/${P}-cmocka-cmake.patch +) -# Work around a problem with >=dev-util/cmake-3.3.0 (bug #558340) +# Work around a problem with >=dev-build/cmake-3.3.0 (bug #558340) # Because of this we cannot use cmake-multilib_src_configure() here. multilib_src_configure() { local mycmakeargs=( diff --git a/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild b/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild index fae0e1958df1..c657ee83055f 100644 --- a/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild +++ b/net-dns/resolvconf-symlink/resolvconf-symlink-0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ S=${WORKDIR} LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="+symlink" pkg_preinst() { diff --git a/net-dns/s6-dns/Manifest b/net-dns/s6-dns/Manifest index 0557975166a4..c7bc622646fa 100644 --- a/net-dns/s6-dns/Manifest +++ b/net-dns/s6-dns/Manifest @@ -1 +1 @@ -DIST s6-dns-2.3.5.3.tar.gz 84916 BLAKE2B b315e2319c4b15401a6e41847faefc1798c3a945fc78f1601b06ce13ef0a55ddde270549e0585cac0356f9b1558a1433675dc4c636d1cc58aee434b86bd81627 SHA512 f3984913df65823c4edbeddc2f8c534926e74c5b06c357c394b05b25943ac8c6b4154859c93e182c60228f018522eb6173ece0bd2dbeffe8e1cc6fcbe33f6a76 +DIST s6-dns-2.3.7.1.tar.gz 92354 BLAKE2B 52f3535cf508054044da74b8fdf03246d8dce11ffaa22f427c18ea27a8a61a46e7bb43bc50962f5c6f04a0b73e8d960a3e9f9acf9ea7c8a66f9706f4c3b8dd69 SHA512 9dabee86d9a27fb0e4a3c10563694bb5734c08c4d730a69daec17dad140274aa104bd6edbd501261c7a7c7bcee505f79134b7119457d5fbedcbb2be6b352ebb0 diff --git a/net-dns/s6-dns/metadata.xml b/net-dns/s6-dns/metadata.xml index 5de557e8ce01..370450aeffe3 100644 --- a/net-dns/s6-dns/metadata.xml +++ b/net-dns/s6-dns/metadata.xml @@ -2,16 +2,12 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>williamh@gentoo.org</email> - <name>William Hubbs</name> - </maintainer> - <maintainer type="person" proxied="yes"> - <email>arkamar@atlas.cz</email> + <email>arkamar@gentoo.org</email> <name>Petr Vaněk</name> </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> + <maintainer type="person"> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> </maintainer> <longdescription lang="en"> s6-dns is a suite of DNS client programs and libraries for Unix systems, diff --git a/net-dns/s6-dns/s6-dns-2.3.5.3.ebuild b/net-dns/s6-dns/s6-dns-2.3.7.1.ebuild index 14abc3c2c212..cc862d7aeb48 100644 --- a/net-dns/s6-dns/s6-dns-2.3.5.3.ebuild +++ b/net-dns/s6-dns/s6-dns-2.3.7.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,13 +10,10 @@ HOMEPAGE="https://www.skarnet.org/software/s6-dns/" SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" LICENSE="ISC" -SLOT="0/$(ver_cut 1-2)" +SLOT="0/$(ver_cut 1-2).7.1" KEYWORDS="~amd64 ~x86" -IUSE="static static-libs" -REQUIRED_USE="static? ( static-libs )" - -RDEPEND=">=dev-libs/skalibs-2.11.1.0:=[static-libs?]" +RDEPEND=">=dev-libs/skalibs-2.14.0.0:=" DEPEND="${RDEPEND}" HTML_DOCS=( doc/. ) @@ -35,15 +32,15 @@ src_configure() { local myconf=( --bindir=/bin - --dynlibdir=/usr/$(get_libdir) - --libdir=/usr/$(get_libdir)/${PN} - --with-dynlib=/usr/$(get_libdir) - --with-lib=/usr/$(get_libdir)/skalibs - --with-sysdeps=/usr/$(get_libdir)/skalibs + --dynlibdir="/$(get_libdir)" + --libdir="/usr/$(get_libdir)/${PN}" + --with-dynlib="/$(get_libdir)" + --with-lib="/usr/$(get_libdir)/skalibs" + --with-sysdeps="/usr/$(get_libdir)/skalibs" --enable-shared - $(use_enable static allstatic) - $(use_enable static static-libc) - $(use_enable static-libs static) + --disable-allstatic + --disable-static + --disable-static-libc ) econf "${myconf[@]}" diff --git a/net-dns/smartdns/Manifest b/net-dns/smartdns/Manifest index 274c5dc55d5e..79a785e427d8 100644 --- a/net-dns/smartdns/Manifest +++ b/net-dns/smartdns/Manifest @@ -1 +1,2 @@ -DIST smartdns-36.1.tar.gz 499257 BLAKE2B c0bca0b8751afd67d7628d993f1093fb95c0864d153e65ebb31d0f9ccf76c7581f98a7fc16cf503cfa83f4d3e9b05e7c21818f34fa34ce770e9e0f0c3eced921 SHA512 88da539f12351bfef256e93d851a08247699ed2f08724abd5d0cc770a6b0475e0540d2aef6f43524edc48cccd9f58db3ad4c68561b26812bf8863b543748c549 +DIST smartdns-43.tar.gz 572029 BLAKE2B 8f4ec3b1b1a804a6624107ed3d97e8015690db9c405fc52d1e34ac9bda280ef0785b7d9648dfd41809a1f729679b6241f36b3c7a4dc88a60e77b2d0ca463ca69 SHA512 ab4ce7ac5fe05173a660f8dce61e7cc0ec8375ff7d64d08e854f73e5cfd78fec702220f076b75efe9518334a384b9689898d5c2856cc506d294b5325733bb9c6 +DIST smartdns-45.tar.gz 631756 BLAKE2B 3bc187b5513b4d02f546b285c5196cdcb3a6851ba679645a4e8bb24d3b338502a2cedc8d21c8397a5370a0330c3e083b7fc880dd972f5c5bc6c72501545d76d4 SHA512 351b2d9591a6c17349ffcd199cb7b387c8b7ec692a0ee16d163d6118dabfdbc4bf67cedc1695c73b2d20b2ee6b4b99fc81a9e26e1eda5e02c477208b140d7cb6 diff --git a/net-dns/smartdns/metadata.xml b/net-dns/smartdns/metadata.xml index 1ab427e8f0b6..9dec082b6586 100644 --- a/net-dns/smartdns/metadata.xml +++ b/net-dns/smartdns/metadata.xml @@ -5,4 +5,8 @@ <email>dlan@gentoo.org</email> <name>Yixun Lan</name> </maintainer> + <upstream> + <bugs-to>https://github.com/pymumu/smartdns/issues</bugs-to> + <remote-id type="github">pymumu/smartdns</remote-id> + </upstream> </pkgmetadata> diff --git a/net-dns/smartdns/smartdns-36.1.ebuild b/net-dns/smartdns/smartdns-43.ebuild index b3addca60631..1cb256b86f6b 100644 --- a/net-dns/smartdns/smartdns-36.1.ebuild +++ b/net-dns/smartdns/smartdns-43.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,6 @@ KEYWORDS="~amd64" DEPEND="dev-libs/openssl:0=" RDEPEND="${DEPEND}" -BDEPEND="" S="${WORKDIR}/${PN}-Release${PV}" diff --git a/net-dns/smartdns/smartdns-45.ebuild b/net-dns/smartdns/smartdns-45.ebuild new file mode 100644 index 000000000000..9d01b7f6763a --- /dev/null +++ b/net-dns/smartdns/smartdns-45.ebuild @@ -0,0 +1,32 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd +DESCRIPTION="A local DNS server returns the fastest access results" +HOMEPAGE="https://github.com/pymumu/smartdns" +SRC_URI="https://github.com/pymumu/smartdns/archive/refs/tags/Release${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="dev-libs/openssl:0=" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${PN}-Release${PV}" + +src_prepare() { + default + sed -i -e "/install .*default /d" \ + -e "/install .*init.d /d" Makefile || die +} + +src_install() { + emake DESTDIR="${D}" \ + SYSTEMDSYSTEMUNITDIR="$(systemd_get_systemunitdir)" install + + newconfd "${FILESDIR}"/smartdns.confd smartdns + newinitd "${FILESDIR}"/smartdns.initd smartdns +} diff --git a/net-dns/totd/Manifest b/net-dns/totd/Manifest deleted file mode 100644 index 533c21b3b7ac..000000000000 --- a/net-dns/totd/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST totd-1.5.1.tar.gz 235809 BLAKE2B ceab2edbebe22162db7193a6e20b0ae2c960c1e613afc3a4ecf068c8f7f3d0f798d03d6c392955799c4fbd1fec10561502e4da08c4a5b39ce5d313a2c0e09663 SHA512 47087fd0478bc2952b25a0952ffb7273e4fdebda019f61fd0bad3c0305ab8f6e32b8f8dd042364f9ae6e6bd31c223e8fd3b17e3b4d44219fd6509f530f56025a diff --git a/net-dns/totd/files/totd b/net-dns/totd/files/totd deleted file mode 100644 index 79d410acb013..000000000000 --- a/net-dns/totd/files/totd +++ /dev/null @@ -1,38 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -checkconfig() { - if [ ! -f /etc/totd.conf ] - then - eerror "The config file /etc/totd.conf does not exist." - return 1 - else - return 0 - fi -} - -start() { - checkconfig || return 1 - - ebegin "Starting totd" - start-stop-daemon --start --quiet --exec /usr/sbin/totd - eend $? -} - -stop() { - local pid_file - pid_file="`grep ^pidfile /etc/totd.conf | cut -f2 -d ' '`" - ebegin "Stopping totd" - if [ -n "$pid_file" ] - then - start-stop-daemon --stop --quiet --pidfile $pid_file - else - start-stop-daemon --stop --quiet --pidfile /var/run/totd.pid - fi - eend $? -} diff --git a/net-dns/totd/files/totd-1.5.1-fix-CC.patch b/net-dns/totd/files/totd-1.5.1-fix-CC.patch deleted file mode 100644 index 3ebbd419d0e2..000000000000 --- a/net-dns/totd/files/totd-1.5.1-fix-CC.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -4,7 +4,7 @@ - # <$Id: Makefile.in,v 3.43 2005/01/31 11:55:14 dillema Exp $> - # - --CC = gcc -+CC = @CC@ - - # These use the standard autoconf variables, which by default are - # rooted in @prefix@ diff --git a/net-dns/totd/files/totd-1.5.1-no_werror.patch b/net-dns/totd/files/totd-1.5.1-no_werror.patch deleted file mode 100644 index 246e709d5109..000000000000 --- a/net-dns/totd/files/totd-1.5.1-no_werror.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- totd-1.5.1/Makefile.in 2005-01-31 12:55:14.000000000 +0100 -+++ totd-1.5.1_new/Makefile.in 2007-06-30 22:51:07.000000000 +0200 -@@ -19,7 +19,7 @@ - - INSTALL = /usr/bin/install - --CFLAGS = @CFLAGS@ @DEFS@ -Werror -Wall -DTOTCONF=\"$(TOT_CONFIG_FILE)\" @OPTFLAGS@ $(INCLUDEPATH) -+CFLAGS = @CFLAGS@ @DEFS@ -Wall -DTOTCONF=\"$(TOT_CONFIG_FILE)\" @OPTFLAGS@ $(INCLUDEPATH) - - # When debugging is enabled by --enable-malloc-debug flag to the configure - # script, the @DBMALLOC@ substitution will contain the empty string, thus diff --git a/net-dns/totd/metadata.xml b/net-dns/totd/metadata.xml deleted file mode 100644 index 1dc73d3c7c92..000000000000 --- a/net-dns/totd/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <longdescription lang="en"> - Totd ( Trick Or Treat Daemon ) is a small DNS proxy nameserver that - supports IPv6 only hosts/networks that communicate with the IPv4 world - using some translation mechanism. - </longdescription> -</pkgmetadata> diff --git a/net-dns/totd/totd-1.5.1.ebuild b/net-dns/totd/totd-1.5.1.ebuild deleted file mode 100644 index c2661cc9ce63..000000000000 --- a/net-dns/totd/totd-1.5.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Trick Or Treat Daemon, a DNS proxy for 6to4" -HOMEPAGE="http://www.dillema.net/software/totd.html" -SRC_URI="http://www.dillema.net/software/${PN}/${P}.tar.gz" - -LICENSE="totd BSD BSD-4 GPL-2" -SLOT="0" -KEYWORDS="~amd64 x86" - -PATCHES=( - "${FILESDIR}"/${P}-no_werror.patch - "${FILESDIR}"/${P}-fix-CC.patch -) - -src_configure() { - econf \ - --enable-ipv4 \ - --enable-ipv6 \ - --enable-stf \ - --enable-scoped-rewrite \ - --disable-http-server -} - -src_install() { - dosbin totd - doman totd.8 - dodoc totd.conf.sample README INSTALL - - doinitd "${FILESDIR}"/totd -} - -pkg_postinst() { - elog "The totd.conf.sample file in /usr/share/doc/${P}/ contains" - elog "a sample config file for totd. Make sure you create" - elog "/etc/totd.conf with the necessary configurations" -} diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest index 0fb0a6e82745..bbba2e811526 100644 --- a/net-dns/unbound/Manifest +++ b/net-dns/unbound/Manifest @@ -1,6 +1,14 @@ -DIST unbound-1.13.1.tar.gz 5976957 BLAKE2B 5fabb9205773a1983842e41cf7a4d6c3878fa8beb7c8ccc71ae1edf7738cb9506c3d7bb32cf887b305317ca695bf876d9f5bf9aeb0129b0e9e926d437b3e6eb3 SHA512 f4d26dca28dbcc33a5e65a55147fa01077c331292e88b6a87798cb6c3d4edb0515015d131fd893c92b74d22d9998a640f0adce404e6192d61ebe69a6a599287c -DIST unbound-1.13.2.tar.gz 6127915 BLAKE2B 71806edc86b323ff1f9f2d7bd3f699b15da2cd1cfefe9ca6008d74915dd6c7b45690026fb0244531ae563a3ca1b142f21fc8aed97ba4bb0015d8ab9196ff045a SHA512 1e89441446e7a25c6a49bded645f8b348c1758c3be54e3a986041cb1f00c45d152fd469dc52666fb820574db9d51b16f1627dc8afcb9519508d4833ca358191a -DIST unbound-1.14.0.tar.gz 6152326 BLAKE2B ceccfbcbc16370153005f32d19be44bd41a4ac935cb7b9a90128d604c9874b06cc7de8b92dc34585d7957f0ad90ce2f441c2ed092c9307bcf4335f8d99eb8bd3 SHA512 57f91d898b0a5d42e6a2ff1ccaec474f04dd5ad3c98e7eb7aa8d5eaa23b587f3077cf7eddf4df38f537c6d387028f12c2518ff13b7249aa7a1155cd6532a46b5 -DIST unbound-1.14.0.tar.gz.asc 833 BLAKE2B 21df47fba46db82ce8fcbf9f39e8e16f8d5ece493dbdc8fe8cad749e3f8e1af164c4280f9722d9f507199ae59a851925a7856bc9e11926b05f253b4342b06383 SHA512 5f77f33040bd783c8d67a50cb5a97435842203e6c2152f40994fba772777db60f01ab76156aa95a477ee50ae22f4227162cdd1fc0e4ae388c6b47f91ac9a5b95 -DIST unbound-1.15.0.tar.gz 6163470 BLAKE2B e67756fb28aac784431484e5f834cbe3864a0ec021a8c9eb3124a6d5732fea99a073815a624210e43e50b3b59ce943c5cc6a4e5e1c743b91f5803e2dcf5c9870 SHA512 c5dab305694c14f64e05080700bb52f6e6bf5b76f15e1fde34e35c932cb3ffed0de2c03b570cf4bfe18165cb10e82e67ee9b12c6583295380f88c2c03800cc1f -DIST unbound-1.15.0.tar.gz.asc 833 BLAKE2B 166cbb1caf14fb4a4375d609c740e7305ed4ee19c1e307caf1e780eb3f53e86db2d34b3f21e1d0c5f1496eac9211ce795c085ab9944f66f9a2f54d08479254db SHA512 123818a855689ee3d402fd8f4b5a4646c08d5602e4544ce872d132c4c0de4a79c9efcc2d49324bf58ab06521f02deef795d89bdf632eee758e6ec36b408ea54a +DIST unbound-1.16.3.tar.gz 6204330 BLAKE2B b97deade78ab903363e06ff9d71b9895c754378ec276bb17556de62c48a88af5fbabd26f97fb47313d1e631fe75dee245aa38fbf42a865ac3e764882a1124a51 SHA512 ef5cda926dd1082a750615d8687bccd756869c66e9f24f984fda4c6613f94f3e4884db328b8d7b490777a75d3e616dcb61c5258e7777923c0590e6fabacd207c +DIST unbound-1.16.3.tar.gz.asc 833 BLAKE2B 2009dac660405b11725c046099cf9bd2f6ccea0bda8936530228b6ab3ceebfadd119b5d91ff1c86845d54444104f578597a574daed80a5e6e677c8f7d68b789b SHA512 b106f080d877e479d944a7ebe24a380f4c40c38308733f43f8a60d4e7aedc6597e6daa4a1428f596e705c9c75e6ee7b4187dbbc5750a9c406f59d76d4f1b4a8d +DIST unbound-1.17.0.tar.gz 6235060 BLAKE2B 611c1b96ff84e6dd8f7a592135cc17f416cd810d0f35d27c8cedd56af069badd8dca112cc5927a1fe50ec3335c377b6bd6fc4e1a6d63a332a90d676e3c23dcef SHA512 f6b9f279330fb19b5feca09524959940aad8c4e064528aa82b369c726d77e9e8e5ca23f366f6e9edcf2c061b96f482ed7a2c26ac70fc15ae5762b3d7e36a5284 +DIST unbound-1.17.0.tar.gz.asc 833 BLAKE2B 8b77a16fa1287af7c12720cce0b45c1ab49f691a0516674d28009d5da8c71d5d56a9518e16fb752c2db58dc835223d55ff863bfc03971aa408eb0f65a65600bf SHA512 e1567f088bdf0a96dbdcf365deccb72f42319b9b29510d5d9aefbe66df054446d3dcdfcc54826046af6e4f751aa518798b968685611b1b7f1860f66a96e32a57 +DIST unbound-1.17.1.tar.gz 6244773 BLAKE2B c2dec1608e28302da33ee72144bb8eb16cdff2e949e548f9ea5edb10b370e396085de641446b1f94daeb96a48a02f9361ebae69f72f3d449575fe3ce93dcdb5b SHA512 10dd4c3aff77f1c0d19eb3c66956ed6ef1aae19e827d0b3259dc75d9de28dedd41862982a299e67ee07e17fb52058b4beee9d4b1d3bb0a3f633b9ba5b864d168 +DIST unbound-1.17.1.tar.gz.asc 833 BLAKE2B d78338da7ca590ef29403b24c271edf8f2eb026ad1f74ba9646f5539e41c6770e172133e1f1dbf1f31623d8f5828f78b8cc3a86bb72f1d6591967c98a994726b SHA512 d663c2ebf9ba4420eb6cd351378d646ac4c9e88bd69913dc1c862a326e98329496a901c86b857f2c157c0401a289ff91e5ac83911477cb9894156c6d959b2b80 +DIST unbound-1.18.0.tar.gz 6315297 BLAKE2B 55f68cdb08281adaa7446f9b284d850e5e0cbbcbeda98609d9f8297d1bb298fcba51fa0a0805df5acc0a475397c65d295a33ae26144cdafbedb9686915dd174b SHA512 24ca6bfe0ed493eb6aaa5cb1b2b108076ce97c48de7470adf596d1154254351e382b83aae33fcd8d4fa64847e359613e00c979b6f3ba7671215b2d0fd2b03b14 +DIST unbound-1.18.0.tar.gz.asc 833 BLAKE2B fb6be5100b960ef6ad279458a2492cc308a120e65a8fcd71aa5a5505bd6213be0ff232c6fd81939bbe53cdddbaa9bd24b79dcc96c69b360ae391b597d9a1d9d7 SHA512 222ff184d952b9ee8ce81e1f3384d1640ff4695ca60b7d5f946dc24489d583618fc0f4e3c169514b699c684766fdb352f47ca29853223fbae70a65fd994d4fd2 +DIST unbound-1.19.0.tar.gz 6336113 BLAKE2B 66ec2b1cd32ac5930c088c73e884bc1fb4d35526a0c89bdbe209defd3e78326ce9b3c1a523fc1ab28b8fdf0e457280d5de7b300cf560c15d875f460bc361f5c7 SHA512 c7df997ab003d098f53ac97ffb4c8428ab28e24573ff21e21782cbeadca42edadeb5b0db53ce954c9ff3106a5edb36eb47109240c554a44d9aac75727b66aeb4 +DIST unbound-1.19.0.tar.gz.asc 833 BLAKE2B 5e593223a47afaebd5e595a9520288ca5d8adee720d5e9989e7d8dd28ad1cce3e1850fec29886e0e52af14dd288b5c9c68a3a05f1d835c15e11d5bf01a08ad50 SHA512 63aa94192de7840f7abe43367e2c3f5d3fd42b8d72c08a5645cf28e2c0ad2e11d54f3aa645384fff5d4dfe66bc7ee25d81bd967780a992b54956343974206580 +DIST unbound-1.19.1.tar.gz 6340435 BLAKE2B a48c5b9493eb0a9aa2171956e08677e1cfb7c49b53731c1b05f9192434c4d815eba972aab110ba0ee25fee1e7a57192c8b48e59bb21fb76ad7fd1c7d2d260012 SHA512 c81192b70f14a4e289cf738bf6b647cf25b58b1ab11076dee306ff25a530b6a1bbeca71cfa8820d80f48fd843019beb29a68796a1b1fcec6e561dfeccd62d96a +DIST unbound-1.19.1.tar.gz.asc 833 BLAKE2B 30721d7bc7b2f5fee8ce090bd06d86f856f2cfb194a26d4cc7b9563944f32f5513305dba2ff482ad1cc10f47e2c58975ac3911c9a4efd72d2f42a28b73dd76ac SHA512 2e4c6b7df844d1fb93d948791a20b9ff201bd1e6de6c89a830ddce06e24e5d770409265005f549757ef3a9c99d11b9860ae21711425d76d42bf2c33240dd3b52 +DIST unbound-1.19.3.tar.gz 6338685 BLAKE2B 5d9cbc26510afc2b92ecce6307cd9924a1b450892f7839f076535177ab35f78059d271e628e2aa995b62f5cf97add2363561a819d6e0181beb6b44421661d8f0 SHA512 f860614f090a5a081cceff8ca7f4b3d416c00a251ae14ceb6b4159dc8cd022f025592074d3d78aee2f86c3eeae9d1a314713e4740aa91062579143199accd159 +DIST unbound-1.19.3.tar.gz.asc 833 BLAKE2B 6eb71dde451a123ffba44c298d83256613c6325b26adffb6f0347b468bf84e63b090655d12b323f8c187ad4782fad06514fe5ab0246087bd129393d1bdb1533c SHA512 1b6437d7ac4394ab7d6eb0d12f22b39538152f9c88175a5368263059950b8e6b093fa5392d1ff37874effef7a422afa9c690f766802208979a99500a4bea5906 diff --git a/net-dns/unbound/metadata.xml b/net-dns/unbound/metadata.xml index 4b78f252682f..86c41bca787c 100644 --- a/net-dns/unbound/metadata.xml +++ b/net-dns/unbound/metadata.xml @@ -5,10 +5,6 @@ <email>mschiff@gentoo.org</email> <name>Marc Schiffbauer</name> </maintainer> - <maintainer type="person"> - <email>whissi@gentoo.org</email> - <name>Thomas Deutschmann</name> - </maintainer> <longdescription lang="en"> Unbound is a validating, recursive, and caching DNS resolver. diff --git a/net-dns/unbound/unbound-1.15.0.ebuild b/net-dns/unbound/unbound-1.16.3.ebuild index 5d8427f124b1..4b8faa172d10 100644 --- a/net-dns/unbound/unbound-1.15.0.ebuild +++ b/net-dns/unbound/unbound-1.16.3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" -PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd verify-sig @@ -11,11 +11,11 @@ DESCRIPTION="A validating, recursive and caching DNS resolver" HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/" SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz verify-sig? ( https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz.asc )" -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/unbound.net.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/unbound.net.asc LICENSE="BSD GPL-2" SLOT="0/8" # ABI version of libunbound.so -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv x86" IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test +tfo threads" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test )" @@ -47,10 +47,7 @@ CDEPEND="acct-group/unbound BDEPEND="virtual/pkgconfig python? ( dev-lang/swig ) test? ( - || ( - net-libs/ldns[examples(-)] - net-dns/ldns-utils[examples(-)] - ) + net-libs/ldns[examples(-)] dev-util/splint app-text/wdiff ) @@ -95,21 +92,21 @@ src_configure() { multilib_src_configure() { econf \ - $(use_enable debug) \ - $(use_enable gost) \ - $(use_enable dnscrypt) \ - $(use_enable dnstap) \ - $(use_enable ecdsa) \ - $(use_enable ecs subnet) \ + $(multilib_native_use_enable debug) \ + $(multilib_native_use_enable gost) \ + $(multilib_native_use_enable dnscrypt) \ + $(multilib_native_use_enable dnstap) \ + $(multilib_native_use_enable ecdsa) \ + $(multilib_native_use_enable ecs subnet) \ $(multilib_native_use_enable redis cachedb) \ - $(use_enable static-libs static) \ - $(use_enable systemd) \ + $(multilib_native_use_enable static-libs static) \ + $(multilib_native_use_enable systemd) \ $(multilib_native_use_with python pythonmodule) \ $(multilib_native_use_with python pyunbound) \ - $(use_with threads pthreads) \ - $(use_with http2 libnghttp2) \ - $(use_enable tfo tfo-client) \ - $(use_enable tfo tfo-server) \ + $(multilib_native_use_with threads pthreads) \ + $(multilib_native_use_with http2 libnghttp2) \ + $(multilib_native_use_enable tfo tfo-client) \ + $(multilib_native_use_enable tfo tfo-server) \ --disable-flto \ --disable-rpath \ --enable-event-api \ diff --git a/net-dns/unbound/unbound-1.14.0-r1.ebuild b/net-dns/unbound/unbound-1.17.0.ebuild index 5d8427f124b1..9f2aabe896aa 100644 --- a/net-dns/unbound/unbound-1.14.0-r1.ebuild +++ b/net-dns/unbound/unbound-1.17.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" -PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd verify-sig @@ -11,11 +11,11 @@ DESCRIPTION="A validating, recursive and caching DNS resolver" HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/" SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz verify-sig? ( https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz.asc )" -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/unbound.net.asc +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/unbound.net.asc LICENSE="BSD GPL-2" SLOT="0/8" # ABI version of libunbound.so -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86" IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test +tfo threads" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test )" @@ -47,10 +47,7 @@ CDEPEND="acct-group/unbound BDEPEND="virtual/pkgconfig python? ( dev-lang/swig ) test? ( - || ( - net-libs/ldns[examples(-)] - net-dns/ldns-utils[examples(-)] - ) + net-libs/ldns[examples(-)] dev-util/splint app-text/wdiff ) @@ -95,21 +92,21 @@ src_configure() { multilib_src_configure() { econf \ - $(use_enable debug) \ - $(use_enable gost) \ - $(use_enable dnscrypt) \ - $(use_enable dnstap) \ - $(use_enable ecdsa) \ - $(use_enable ecs subnet) \ + $(multilib_native_use_enable debug) \ + $(multilib_native_use_enable gost) \ + $(multilib_native_use_enable dnscrypt) \ + $(multilib_native_use_enable dnstap) \ + $(multilib_native_use_enable ecdsa) \ + $(multilib_native_use_enable ecs subnet) \ $(multilib_native_use_enable redis cachedb) \ - $(use_enable static-libs static) \ - $(use_enable systemd) \ + $(multilib_native_use_enable static-libs static) \ + $(multilib_native_use_enable systemd) \ $(multilib_native_use_with python pythonmodule) \ $(multilib_native_use_with python pyunbound) \ - $(use_with threads pthreads) \ - $(use_with http2 libnghttp2) \ - $(use_enable tfo tfo-client) \ - $(use_enable tfo tfo-server) \ + $(multilib_native_use_with threads pthreads) \ + $(multilib_native_use_with http2 libnghttp2) \ + $(multilib_native_use_enable tfo tfo-client) \ + $(multilib_native_use_enable tfo tfo-server) \ --disable-flto \ --disable-rpath \ --enable-event-api \ diff --git a/net-dns/unbound/unbound-1.13.2-r1.ebuild b/net-dns/unbound/unbound-1.17.1.ebuild index 52208581e7b2..9f4ed54c6f17 100644 --- a/net-dns/unbound/unbound-1.13.2-r1.ebuild +++ b/net-dns/unbound/unbound-1.17.1.ebuild @@ -1,19 +1,24 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="8" -PYTHON_COMPAT=( python3_{7,8,9,10} ) +EAPI=8 -inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd +PYTHON_COMPAT=( python3_{10..11} ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/unbound.net.asc +inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd verify-sig MY_P=${PN}-${PV/_/} DESCRIPTION="A validating, recursive and caching DNS resolver" HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/" -SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz" +SRC_URI=" + https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz + verify-sig? ( https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz.asc ) +" +S="${WORKDIR}"/${MY_P} LICENSE="BSD GPL-2" SLOT="0/8" # ABI version of libunbound.so -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv x86" IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test +tfo threads" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test )" @@ -22,8 +27,8 @@ RESTRICT="!test? ( test )" # and doesn't make it possible to easily install the library without # the executables. MULTILIB_USEDEP may be dropped once build system # is fixed. - -CDEPEND="acct-group/unbound +DEPEND=" + acct-group/unbound acct-user/unbound >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] >=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}] @@ -41,28 +46,21 @@ CDEPEND="acct-group/unbound redis? ( dev-libs/hiredis:= ) systemd? ( sys-apps/systemd ) " - -BDEPEND="virtual/pkgconfig +BDEPEND=" + virtual/pkgconfig python? ( dev-lang/swig ) test? ( - || ( - net-libs/ldns[examples(-)] - net-dns/ldns-utils[examples(-)] - ) + net-libs/ldns[examples(-)] dev-util/splint app-text/wdiff ) + verify-sig? ( sec-keys/openpgp-keys-unbound ) " - -DEPEND="${CDEPEND}" - -RDEPEND="${CDEPEND} +RDEPEND=" + ${DEPEND} net-dns/dnssec-root - selinux? ( sec-policy/selinux-bind )" - -# bug #347415 -RDEPEND="${RDEPEND} - net-dns/dnssec-root" + selinux? ( sec-policy/selinux-bind ) +" PATCHES=( "${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch @@ -70,8 +68,6 @@ PATCHES=( "${FILESDIR}"/${PN}-1.10.1-find-ar.patch ) -S=${WORKDIR}/${MY_P} - pkg_setup() { use python && python-single-r1_pkg_setup } @@ -81,7 +77,7 @@ src_prepare() { eautoreconf - # required for the python part + # Required for the python part multilib_copy_sources } @@ -91,38 +87,44 @@ src_configure() { } multilib_src_configure() { - econf \ - $(use_enable debug) \ - $(use_enable gost) \ - $(use_enable dnscrypt) \ - $(use_enable dnstap) \ - $(use_enable ecdsa) \ - $(use_enable ecs subnet) \ - $(multilib_native_use_enable redis cachedb) \ - $(use_enable static-libs static) \ - $(use_enable systemd) \ - $(multilib_native_use_with python pythonmodule) \ - $(multilib_native_use_with python pyunbound) \ - $(use_with threads pthreads) \ - $(use_with http2 libnghttp2) \ - $(use_enable tfo tfo-client) \ - $(use_enable tfo tfo-server) \ - --disable-flto \ - --disable-rpath \ - --enable-event-api \ - --enable-ipsecmod \ - --with-libevent="${ESYSROOT}"/usr \ - $(multilib_native_usex redis --with-libhiredis="${ESYSROOT}/usr" --without-libhiredis) \ - --with-pidfile="${EPREFIX}"/run/unbound.pid \ - --with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \ - --with-ssl="${ESYSROOT}"/usr \ + local myeconfargs=( + $(multilib_native_use_enable debug) + $(multilib_native_use_enable gost) + $(multilib_native_use_enable dnscrypt) + $(multilib_native_use_enable dnstap) + $(multilib_native_use_enable ecdsa) + $(multilib_native_use_enable ecs subnet) + $(multilib_native_use_enable redis cachedb) + $(multilib_native_use_enable static-libs static) + $(multilib_native_use_enable systemd) + $(multilib_native_use_with python pythonmodule) + $(multilib_native_use_with python pyunbound) + $(multilib_native_use_with threads pthreads) + $(multilib_native_use_with http2 libnghttp2) + $(multilib_native_use_enable tfo tfo-client) + $(multilib_native_use_enable tfo tfo-server) + + --disable-flto + --disable-rpath + --enable-event-api + --enable-ipsecmod + + --with-libevent="${ESYSROOT}"/usr + $(multilib_native_usex redis --with-libhiredis="${ESYSROOT}/usr" --without-libhiredis) + + --with-pidfile="${EPREFIX}"/run/unbound.pid + --with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt + --with-ssl="${ESYSROOT}"/usr --with-libexpat="${ESYSROOT}"/usr # http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html - # $(use_enable debug lock-checks) \ - # $(use_enable debug alloc-checks) \ - # $(use_enable debug alloc-lite) \ - # $(use_enable debug alloc-nonregional) \ + # $(use_enable debug lock-checks) + # $(use_enable debug alloc-checks) + # $(use_enable debug alloc-lite) + # $(use_enable debug alloc-nonregional) + ) + + econf "${myeconfargs[@]}" } multilib_src_install() { @@ -151,7 +153,7 @@ multilib_src_install_all() { exeinto /usr/share/${PN} doexe contrib/update-anchor.sh - # create space for auto-trust-anchor-file... + # Create space for auto-trust-anchor-file... keepdir /etc/unbound/var fowners root:unbound /etc/unbound/var fperms 0770 /etc/unbound/var @@ -173,14 +175,14 @@ multilib_src_install_all() { } pkg_postinst() { - if [[ ! -f "${EROOT}/etc/unbound/unbound_control.key" ]] ; then + if [[ ! -f "${EROOT}/etc/unbound/unbound_control.key" ]]; then einfo "Trying to create unbound control key ..." if ! unbound-control-setup &>/dev/null ; then ewarn "Failed to create unbound control key!" fi fi - if [[ ! -f "${EROOT}/etc/unbound/var/root-anchors.txt" ]] ; then + if [[ ! -f "${EROOT}/etc/unbound/var/root-anchors.txt" ]]; then einfo "" einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation" einfo "set 'auto-trust-anchor-file: ${EROOT}/etc/unbound/var/root-anchors.txt' in ${EROOT}/etc/unbound/unbound.conf" @@ -197,7 +199,7 @@ pkg_postinst() { local _perm_check_testfile=$(mktemp --dry-run "${EPREFIX}"/etc/unbound/var/.pkg_postinst-perm-check.XXXXXXXXX) su -s /bin/sh -c "touch ${_perm_check_testfile}" unbound &>/dev/null - if [ $? -ne 0 ] ; then + if [[ $? -ne 0 ]]; then ewarn "WARNING: unbound user cannot write to \"${EPREFIX}/etc/unbound/var\"!" ewarn "Run the following commands to restore default permission:" ewarn "" diff --git a/net-dns/unbound/unbound-1.13.1-r3.ebuild b/net-dns/unbound/unbound-1.18.0.ebuild index 899aeefb9daf..448585d69c94 100644 --- a/net-dns/unbound/unbound-1.13.1-r3.ebuild +++ b/net-dns/unbound/unbound-1.18.0.ebuild @@ -1,20 +1,27 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -PYTHON_COMPAT=( python3_{7,8,9} ) +EAPI=8 -inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd +PYTHON_COMPAT=( python3_{10..11} ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/unbound.net.asc +inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd verify-sig MY_P=${PN}-${PV/_/} DESCRIPTION="A validating, recursive and caching DNS resolver" HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/" -SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz" +SRC_URI=" + https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz + verify-sig? ( https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz.asc ) +" +S="${WORKDIR}"/${MY_P} LICENSE="BSD GPL-2" SLOT="0/8" # ABI version of libunbound.so -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 x86" -IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test threads" +if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86" +fi +IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test +tfo threads" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test )" @@ -22,8 +29,8 @@ RESTRICT="!test? ( test )" # and doesn't make it possible to easily install the library without # the executables. MULTILIB_USEDEP may be dropped once build system # is fixed. - -CDEPEND="acct-group/unbound +DEPEND=" + acct-group/unbound acct-user/unbound >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] >=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}] @@ -38,29 +45,24 @@ CDEPEND="acct-group/unbound ) http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) python? ( ${PYTHON_DEPS} ) - redis? ( dev-libs/hiredis:= )" - -BDEPEND="virtual/pkgconfig" - -DEPEND="${CDEPEND} + redis? ( dev-libs/hiredis:= ) + systemd? ( sys-apps/systemd ) +" +BDEPEND=" + virtual/pkgconfig python? ( dev-lang/swig ) test? ( - || ( - net-libs/ldns[examples(-)] - net-dns/ldns-utils[examples(-)] - ) + net-libs/ldns[examples(-)] dev-util/splint app-text/wdiff ) - systemd? ( sys-apps/systemd )" - -RDEPEND="${CDEPEND} + verify-sig? ( sec-keys/openpgp-keys-unbound ) +" +RDEPEND=" + ${DEPEND} net-dns/dnssec-root - selinux? ( sec-policy/selinux-bind )" - -# bug #347415 -RDEPEND="${RDEPEND} - net-dns/dnssec-root" + selinux? ( sec-policy/selinux-bind ) +" PATCHES=( "${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch @@ -68,8 +70,6 @@ PATCHES=( "${FILESDIR}"/${PN}-1.10.1-find-ar.patch ) -S=${WORKDIR}/${MY_P} - pkg_setup() { use python && python-single-r1_pkg_setup } @@ -79,7 +79,7 @@ src_prepare() { eautoreconf - # required for the python part + # Required for the python part multilib_copy_sources } @@ -89,38 +89,44 @@ src_configure() { } multilib_src_configure() { - econf \ - $(use_enable debug) \ - $(use_enable gost) \ - $(use_enable dnscrypt) \ - $(use_enable dnstap) \ - $(use_enable ecdsa) \ - $(use_enable ecs subnet) \ - $(multilib_native_use_enable redis cachedb) \ - $(use_enable static-libs static) \ - $(use_enable systemd) \ - $(multilib_native_use_with python pythonmodule) \ - $(multilib_native_use_with python pyunbound) \ - $(use_with threads pthreads) \ - $(use_with http2 libnghttp2) \ - --disable-flto \ - --disable-rpath \ - --enable-event-api \ - --enable-ipsecmod \ - --enable-tfo-client \ - --enable-tfo-server \ - --with-libevent="${EPREFIX}"/usr \ - $(multilib_native_usex redis --with-libhiredis="${EPREFIX}/usr" --without-libhiredis) \ - --with-pidfile="${EPREFIX}"/run/unbound.pid \ - --with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \ - --with-ssl="${EPREFIX}"/usr \ - --with-libexpat="${EPREFIX}"/usr + local myeconfargs=( + $(multilib_native_use_enable debug) + $(multilib_native_use_enable gost) + $(multilib_native_use_enable dnscrypt) + $(multilib_native_use_enable dnstap) + $(multilib_native_use_enable ecdsa) + $(multilib_native_use_enable ecs subnet) + $(multilib_native_use_enable redis cachedb) + $(multilib_native_use_enable static-libs static) + $(multilib_native_use_enable systemd) + $(multilib_native_use_with python pythonmodule) + $(multilib_native_use_with python pyunbound) + $(multilib_native_use_with threads pthreads) + $(multilib_native_use_with http2 libnghttp2) + $(multilib_native_use_enable tfo tfo-client) + $(multilib_native_use_enable tfo tfo-server) + + --disable-flto + --disable-rpath + --enable-event-api + --enable-ipsecmod + + --with-libevent="${ESYSROOT}"/usr + $(multilib_native_usex redis --with-libhiredis="${ESYSROOT}/usr" --without-libhiredis) + + --with-pidfile="${EPREFIX}"/run/unbound.pid + --with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt + --with-ssl="${ESYSROOT}"/usr + --with-libexpat="${ESYSROOT}"/usr # http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html - # $(use_enable debug lock-checks) \ - # $(use_enable debug alloc-checks) \ - # $(use_enable debug alloc-lite) \ - # $(use_enable debug alloc-nonregional) \ + # $(use_enable debug lock-checks) + # $(use_enable debug alloc-checks) + # $(use_enable debug alloc-lite) + # $(use_enable debug alloc-nonregional) + ) + + econf "${myeconfargs[@]}" } multilib_src_install() { @@ -149,7 +155,7 @@ multilib_src_install_all() { exeinto /usr/share/${PN} doexe contrib/update-anchor.sh - # create space for auto-trust-anchor-file... + # Create space for auto-trust-anchor-file... keepdir /etc/unbound/var fowners root:unbound /etc/unbound/var fperms 0770 /etc/unbound/var @@ -171,14 +177,14 @@ multilib_src_install_all() { } pkg_postinst() { - if [[ ! -f "${EROOT}/etc/unbound/unbound_control.key" ]] ; then + if [[ ! -f "${EROOT}/etc/unbound/unbound_control.key" ]]; then einfo "Trying to create unbound control key ..." if ! unbound-control-setup &>/dev/null ; then ewarn "Failed to create unbound control key!" fi fi - if [[ ! -f "${EROOT}/etc/unbound/var/root-anchors.txt" ]] ; then + if [[ ! -f "${EROOT}/etc/unbound/var/root-anchors.txt" ]]; then einfo "" einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation" einfo "set 'auto-trust-anchor-file: ${EROOT}/etc/unbound/var/root-anchors.txt' in ${EROOT}/etc/unbound/unbound.conf" @@ -195,7 +201,7 @@ pkg_postinst() { local _perm_check_testfile=$(mktemp --dry-run "${EPREFIX}"/etc/unbound/var/.pkg_postinst-perm-check.XXXXXXXXX) su -s /bin/sh -c "touch ${_perm_check_testfile}" unbound &>/dev/null - if [ $? -ne 0 ] ; then + if [[ $? -ne 0 ]]; then ewarn "WARNING: unbound user cannot write to \"${EPREFIX}/etc/unbound/var\"!" ewarn "Run the following commands to restore default permission:" ewarn "" diff --git a/net-dns/unbound/unbound-1.19.0.ebuild b/net-dns/unbound/unbound-1.19.0.ebuild new file mode 100644 index 000000000000..6e074452236b --- /dev/null +++ b/net-dns/unbound/unbound-1.19.0.ebuild @@ -0,0 +1,218 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/unbound.net.asc +inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd verify-sig + +MY_P=${PN}-${PV/_/} +DESCRIPTION="A validating, recursive and caching DNS resolver" +HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/" +SRC_URI=" + https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz + verify-sig? ( https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz.asc ) +" +S="${WORKDIR}"/${MY_P} + +LICENSE="BSD GPL-2" +SLOT="0/8" # ABI version of libunbound.so +if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi +IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test +tfo threads" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" + +# Note: expat is needed by executable only but the Makefile is custom +# and doesn't make it possible to easily install the library without +# the executables. MULTILIB_USEDEP may be dropped once build system +# is fixed. +DEPEND=" + acct-group/unbound + acct-user/unbound + >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] + >=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}] + >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] + dnscrypt? ( dev-libs/libsodium:=[${MULTILIB_USEDEP}] ) + dnstap? ( + dev-libs/fstrm[${MULTILIB_USEDEP}] + >=dev-libs/protobuf-c-1.0.2-r1:=[${MULTILIB_USEDEP}] + ) + ecdsa? ( + dev-libs/openssl:0[-bindist(-)] + ) + http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) + python? ( ${PYTHON_DEPS} ) + redis? ( dev-libs/hiredis:= ) + systemd? ( sys-apps/systemd ) +" +BDEPEND=" + virtual/pkgconfig + python? ( dev-lang/swig ) + test? ( + net-libs/ldns[examples(-)] + dev-util/splint + app-text/wdiff + ) + verify-sig? ( sec-keys/openpgp-keys-unbound ) +" +RDEPEND=" + ${DEPEND} + net-dns/dnssec-root + selinux? ( sec-policy/selinux-bind ) +" + +QA_CONFIG_IMPL_DECL_SKIP=( + ioctlsocket # not on Linux (bug #900060) +) + +PATCHES=( + "${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch + "${FILESDIR}"/${PN}-1.6.3-pkg-config.patch + "${FILESDIR}"/${PN}-1.10.1-find-ar.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + eautoreconf + + # Required for the python part + multilib_copy_sources +} + +src_configure() { + [[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack + multilib-minimal_src_configure +} + +multilib_src_configure() { + local myeconfargs=( + $(multilib_native_use_enable debug) + $(multilib_native_use_enable gost) + $(multilib_native_use_enable dnscrypt) + $(multilib_native_use_enable dnstap) + $(multilib_native_use_enable ecdsa) + $(multilib_native_use_enable ecs subnet) + $(multilib_native_use_enable redis cachedb) + $(multilib_native_use_enable static-libs static) + $(multilib_native_use_enable systemd) + $(multilib_native_use_with python pythonmodule) + $(multilib_native_use_with python pyunbound) + $(multilib_native_use_with threads pthreads) + $(multilib_native_use_with http2 libnghttp2) + $(multilib_native_use_enable tfo tfo-client) + $(multilib_native_use_enable tfo tfo-server) + + --disable-flto + --disable-rpath + --enable-event-api + --enable-ipsecmod + + --with-libevent="${ESYSROOT}"/usr + $(multilib_native_usex redis --with-libhiredis="${ESYSROOT}/usr" --without-libhiredis) + + --with-pidfile="${EPREFIX}"/run/unbound.pid + --with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt + --with-ssl="${ESYSROOT}"/usr + --with-libexpat="${ESYSROOT}"/usr + + # http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html + # $(use_enable debug lock-checks) + # $(use_enable debug alloc-checks) + # $(use_enable debug alloc-lite) + # $(use_enable debug alloc-nonregional) + ) + + econf "${myeconfargs[@]}" +} + +multilib_src_install() { + emake DESTDIR="${D}" install + systemd_dounit contrib/unbound.service + systemd_dounit contrib/unbound.socket +} + +multilib_src_install_all() { + use python && python_optimize + + newinitd "${FILESDIR}"/unbound-r1.initd unbound + newconfd "${FILESDIR}"/unbound-r1.confd unbound + + systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service" + systemd_dounit "${FILESDIR}"/unbound-anchor.service + + dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES} + + # bug #315519 + dodoc contrib/unbound_munin_ + + docinto selinux + dodoc contrib/selinux/* + + exeinto /usr/share/${PN} + doexe contrib/update-anchor.sh + + # Create space for auto-trust-anchor-file... + keepdir /etc/unbound/var + fowners root:unbound /etc/unbound/var + fperms 0770 /etc/unbound/var + # ... and point example config to it + sed -i \ + -e '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' \ + "${ED}/etc/unbound/unbound.conf" \ + || die + + # Used to store cache data + keepdir /var/lib/${PN} + fowners root:unbound /var/lib/${PN} + fperms 0770 /var/lib/${PN} + + find "${ED}" -name '*.la' -delete || die + if ! use static-libs ; then + find "${ED}" -name "*.a" -delete || die + fi +} + +pkg_postinst() { + if [[ ! -f "${EROOT}/etc/unbound/unbound_control.key" ]]; then + einfo "Trying to create unbound control key ..." + if ! unbound-control-setup &>/dev/null ; then + ewarn "Failed to create unbound control key!" + fi + fi + + if [[ ! -f "${EROOT}/etc/unbound/var/root-anchors.txt" ]]; then + einfo "" + einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation" + einfo "set 'auto-trust-anchor-file: ${EROOT}/etc/unbound/var/root-anchors.txt' in ${EROOT}/etc/unbound/unbound.conf" + einfo "and run" + einfo "" + einfo " su -s /bin/sh -c '${EROOT}/usr/sbin/unbound-anchor -a ${EROOT}/etc/unbound/var/root-anchors.txt' unbound" + einfo "" + einfo "as root to create it initially before starting unbound for the first time after enabling this." + einfo "" + fi + + # Our user is not available on prefix + use prefix && return + + local _perm_check_testfile=$(mktemp --dry-run "${EPREFIX}"/etc/unbound/var/.pkg_postinst-perm-check.XXXXXXXXX) + su -s /bin/sh -c "touch ${_perm_check_testfile}" unbound &>/dev/null + if [[ $? -ne 0 ]]; then + ewarn "WARNING: unbound user cannot write to \"${EPREFIX}/etc/unbound/var\"!" + ewarn "Run the following commands to restore default permission:" + ewarn "" + ewarn " chown root:unbound ${EPREFIX}/etc/unbound/var" + ewarn " chmod 0770 ${EPREFIX}/etc/unbound/var" + else + # Cleanup -- no reason to die here! + rm -f "${_perm_check_testfile}" + fi +} diff --git a/net-dns/unbound/unbound-1.19.1.ebuild b/net-dns/unbound/unbound-1.19.1.ebuild new file mode 100644 index 000000000000..625d321c0a3b --- /dev/null +++ b/net-dns/unbound/unbound-1.19.1.ebuild @@ -0,0 +1,218 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/unbound.net.asc +inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd verify-sig + +MY_P=${PN}-${PV/_/} +DESCRIPTION="A validating, recursive and caching DNS resolver" +HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/" +SRC_URI=" + https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz + verify-sig? ( https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz.asc ) +" +S="${WORKDIR}"/${MY_P} + +LICENSE="BSD GPL-2" +SLOT="0/8" # ABI version of libunbound.so +if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86" +fi +IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test +tfo threads" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" + +# Note: expat is needed by executable only but the Makefile is custom +# and doesn't make it possible to easily install the library without +# the executables. MULTILIB_USEDEP may be dropped once build system +# is fixed. +DEPEND=" + acct-group/unbound + acct-user/unbound + >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] + >=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}] + >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] + dnscrypt? ( dev-libs/libsodium:=[${MULTILIB_USEDEP}] ) + dnstap? ( + dev-libs/fstrm[${MULTILIB_USEDEP}] + >=dev-libs/protobuf-c-1.0.2-r1:=[${MULTILIB_USEDEP}] + ) + ecdsa? ( + dev-libs/openssl:0[-bindist(-)] + ) + http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) + python? ( ${PYTHON_DEPS} ) + redis? ( dev-libs/hiredis:= ) + systemd? ( sys-apps/systemd ) +" +BDEPEND=" + virtual/pkgconfig + python? ( dev-lang/swig ) + test? ( + net-libs/ldns[examples(-)] + dev-util/splint + app-text/wdiff + ) + verify-sig? ( sec-keys/openpgp-keys-unbound ) +" +RDEPEND=" + ${DEPEND} + net-dns/dnssec-root + selinux? ( sec-policy/selinux-bind ) +" + +QA_CONFIG_IMPL_DECL_SKIP=( + ioctlsocket # not on Linux (bug #900060) +) + +PATCHES=( + "${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch + "${FILESDIR}"/${PN}-1.6.3-pkg-config.patch + "${FILESDIR}"/${PN}-1.10.1-find-ar.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + eautoreconf + + # Required for the python part + multilib_copy_sources +} + +src_configure() { + [[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack + multilib-minimal_src_configure +} + +multilib_src_configure() { + local myeconfargs=( + $(multilib_native_use_enable debug) + $(multilib_native_use_enable gost) + $(multilib_native_use_enable dnscrypt) + $(multilib_native_use_enable dnstap) + $(multilib_native_use_enable ecdsa) + $(multilib_native_use_enable ecs subnet) + $(multilib_native_use_enable redis cachedb) + $(multilib_native_use_enable static-libs static) + $(multilib_native_use_enable systemd) + $(multilib_native_use_with python pythonmodule) + $(multilib_native_use_with python pyunbound) + $(multilib_native_use_with threads pthreads) + $(multilib_native_use_with http2 libnghttp2) + $(multilib_native_use_enable tfo tfo-client) + $(multilib_native_use_enable tfo tfo-server) + + --disable-flto + --disable-rpath + --enable-event-api + --enable-ipsecmod + + --with-libevent="${ESYSROOT}"/usr + $(multilib_native_usex redis --with-libhiredis="${ESYSROOT}/usr" --without-libhiredis) + + --with-pidfile="${EPREFIX}"/run/unbound.pid + --with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt + --with-ssl="${ESYSROOT}"/usr + --with-libexpat="${ESYSROOT}"/usr + + # http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html + # $(use_enable debug lock-checks) + # $(use_enable debug alloc-checks) + # $(use_enable debug alloc-lite) + # $(use_enable debug alloc-nonregional) + ) + + econf "${myeconfargs[@]}" +} + +multilib_src_install() { + emake DESTDIR="${D}" install + systemd_dounit contrib/unbound.service + systemd_dounit contrib/unbound.socket +} + +multilib_src_install_all() { + use python && python_optimize + + newinitd "${FILESDIR}"/unbound-r1.initd unbound + newconfd "${FILESDIR}"/unbound-r1.confd unbound + + systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service" + systemd_dounit "${FILESDIR}"/unbound-anchor.service + + dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES} + + # bug #315519 + dodoc contrib/unbound_munin_ + + docinto selinux + dodoc contrib/selinux/* + + exeinto /usr/share/${PN} + doexe contrib/update-anchor.sh + + # Create space for auto-trust-anchor-file... + keepdir /etc/unbound/var + fowners root:unbound /etc/unbound/var + fperms 0770 /etc/unbound/var + # ... and point example config to it + sed -i \ + -e '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' \ + "${ED}/etc/unbound/unbound.conf" \ + || die + + # Used to store cache data + keepdir /var/lib/${PN} + fowners root:unbound /var/lib/${PN} + fperms 0770 /var/lib/${PN} + + find "${ED}" -name '*.la' -delete || die + if ! use static-libs ; then + find "${ED}" -name "*.a" -delete || die + fi +} + +pkg_postinst() { + if [[ ! -f "${EROOT}/etc/unbound/unbound_control.key" ]]; then + einfo "Trying to create unbound control key ..." + if ! unbound-control-setup &>/dev/null ; then + ewarn "Failed to create unbound control key!" + fi + fi + + if [[ ! -f "${EROOT}/etc/unbound/var/root-anchors.txt" ]]; then + einfo "" + einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation" + einfo "set 'auto-trust-anchor-file: ${EROOT}/etc/unbound/var/root-anchors.txt' in ${EROOT}/etc/unbound/unbound.conf" + einfo "and run" + einfo "" + einfo " su -s /bin/sh -c '${EROOT}/usr/sbin/unbound-anchor -a ${EROOT}/etc/unbound/var/root-anchors.txt' unbound" + einfo "" + einfo "as root to create it initially before starting unbound for the first time after enabling this." + einfo "" + fi + + # Our user is not available on prefix + use prefix && return + + local _perm_check_testfile=$(mktemp --dry-run "${EPREFIX}"/etc/unbound/var/.pkg_postinst-perm-check.XXXXXXXXX) + su -s /bin/sh -c "touch ${_perm_check_testfile}" unbound &>/dev/null + if [[ $? -ne 0 ]]; then + ewarn "WARNING: unbound user cannot write to \"${EPREFIX}/etc/unbound/var\"!" + ewarn "Run the following commands to restore default permission:" + ewarn "" + ewarn " chown root:unbound ${EPREFIX}/etc/unbound/var" + ewarn " chmod 0770 ${EPREFIX}/etc/unbound/var" + else + # Cleanup -- no reason to die here! + rm -f "${_perm_check_testfile}" + fi +} diff --git a/net-dns/unbound/unbound-1.19.3.ebuild b/net-dns/unbound/unbound-1.19.3.ebuild new file mode 100644 index 000000000000..67da62c07740 --- /dev/null +++ b/net-dns/unbound/unbound-1.19.3.ebuild @@ -0,0 +1,218 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/unbound.net.asc +inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd verify-sig + +MY_P=${PN}-${PV/_/} +DESCRIPTION="A validating, recursive and caching DNS resolver" +HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/" +SRC_URI=" + https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz + verify-sig? ( https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz.asc ) +" +S="${WORKDIR}"/${MY_P} + +LICENSE="BSD GPL-2" +SLOT="0/8" # ABI version of libunbound.so +if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi +IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test +tfo threads" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" + +# Note: expat is needed by executable only but the Makefile is custom +# and doesn't make it possible to easily install the library without +# the executables. MULTILIB_USEDEP may be dropped once build system +# is fixed. +DEPEND=" + acct-group/unbound + acct-user/unbound + >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] + >=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}] + >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] + dnscrypt? ( dev-libs/libsodium:=[${MULTILIB_USEDEP}] ) + dnstap? ( + dev-libs/fstrm[${MULTILIB_USEDEP}] + >=dev-libs/protobuf-c-1.0.2-r1:=[${MULTILIB_USEDEP}] + ) + ecdsa? ( + dev-libs/openssl:0[-bindist(-)] + ) + http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] ) + python? ( ${PYTHON_DEPS} ) + redis? ( dev-libs/hiredis:= ) + systemd? ( sys-apps/systemd ) +" +BDEPEND=" + virtual/pkgconfig + python? ( dev-lang/swig ) + test? ( + net-libs/ldns[examples(-)] + dev-util/splint + app-text/wdiff + ) + verify-sig? ( sec-keys/openpgp-keys-unbound ) +" +RDEPEND=" + ${DEPEND} + net-dns/dnssec-root + selinux? ( sec-policy/selinux-bind ) +" + +QA_CONFIG_IMPL_DECL_SKIP=( + ioctlsocket # not on Linux (bug #900060) +) + +PATCHES=( + "${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch + "${FILESDIR}"/${PN}-1.6.3-pkg-config.patch + "${FILESDIR}"/${PN}-1.10.1-find-ar.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + eautoreconf + + # Required for the python part + multilib_copy_sources +} + +src_configure() { + [[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack + multilib-minimal_src_configure +} + +multilib_src_configure() { + local myeconfargs=( + $(multilib_native_use_enable debug) + $(multilib_native_use_enable gost) + $(multilib_native_use_enable dnscrypt) + $(multilib_native_use_enable dnstap) + $(multilib_native_use_enable ecdsa) + $(multilib_native_use_enable ecs subnet) + $(multilib_native_use_enable redis cachedb) + $(multilib_native_use_enable static-libs static) + $(multilib_native_use_enable systemd) + $(multilib_native_use_with python pythonmodule) + $(multilib_native_use_with python pyunbound) + $(multilib_native_use_with threads pthreads) + $(multilib_native_use_with http2 libnghttp2) + $(multilib_native_use_enable tfo tfo-client) + $(multilib_native_use_enable tfo tfo-server) + + --disable-flto + --disable-rpath + --enable-event-api + --enable-ipsecmod + + --with-libevent="${ESYSROOT}"/usr + $(multilib_native_usex redis --with-libhiredis="${ESYSROOT}/usr" --without-libhiredis) + + --with-pidfile="${EPREFIX}"/run/unbound.pid + --with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt + --with-ssl="${ESYSROOT}"/usr + --with-libexpat="${ESYSROOT}"/usr + + # http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html + # $(use_enable debug lock-checks) + # $(use_enable debug alloc-checks) + # $(use_enable debug alloc-lite) + # $(use_enable debug alloc-nonregional) + ) + + econf "${myeconfargs[@]}" +} + +multilib_src_install() { + emake DESTDIR="${D}" install + systemd_dounit contrib/unbound.service + systemd_dounit contrib/unbound.socket +} + +multilib_src_install_all() { + use python && python_optimize + + newinitd "${FILESDIR}"/unbound-r1.initd unbound + newconfd "${FILESDIR}"/unbound-r1.confd unbound + + systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service" + systemd_dounit "${FILESDIR}"/unbound-anchor.service + + dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES} + + # bug #315519 + dodoc contrib/unbound_munin_ + + docinto selinux + dodoc contrib/selinux/* + + exeinto /usr/share/${PN} + doexe contrib/update-anchor.sh + + # Create space for auto-trust-anchor-file... + keepdir /etc/unbound/var + fowners root:unbound /etc/unbound/var + fperms 0770 /etc/unbound/var + # ... and point example config to it + sed -i \ + -e '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' \ + "${ED}/etc/unbound/unbound.conf" \ + || die + + # Used to store cache data + keepdir /var/lib/${PN} + fowners root:unbound /var/lib/${PN} + fperms 0770 /var/lib/${PN} + + find "${ED}" -name '*.la' -delete || die + if ! use static-libs ; then + find "${ED}" -name "*.a" -delete || die + fi +} + +pkg_postinst() { + if [[ ! -f "${EROOT}/etc/unbound/unbound_control.key" ]]; then + einfo "Trying to create unbound control key ..." + if ! unbound-control-setup &>/dev/null ; then + ewarn "Failed to create unbound control key!" + fi + fi + + if [[ ! -f "${EROOT}/etc/unbound/var/root-anchors.txt" ]]; then + einfo "" + einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation" + einfo "set 'auto-trust-anchor-file: ${EROOT}/etc/unbound/var/root-anchors.txt' in ${EROOT}/etc/unbound/unbound.conf" + einfo "and run" + einfo "" + einfo " su -s /bin/sh -c '${EROOT}/usr/sbin/unbound-anchor -a ${EROOT}/etc/unbound/var/root-anchors.txt' unbound" + einfo "" + einfo "as root to create it initially before starting unbound for the first time after enabling this." + einfo "" + fi + + # Our user is not available on prefix + use prefix && return + + local _perm_check_testfile=$(mktemp --dry-run "${EPREFIX}"/etc/unbound/var/.pkg_postinst-perm-check.XXXXXXXXX) + su -s /bin/sh -c "touch ${_perm_check_testfile}" unbound &>/dev/null + if [[ $? -ne 0 ]]; then + ewarn "WARNING: unbound user cannot write to \"${EPREFIX}/etc/unbound/var\"!" + ewarn "Run the following commands to restore default permission:" + ewarn "" + ewarn " chown root:unbound ${EPREFIX}/etc/unbound/var" + ewarn " chmod 0770 ${EPREFIX}/etc/unbound/var" + else + # Cleanup -- no reason to die here! + rm -f "${_perm_check_testfile}" + fi +} diff --git a/net-dns/updatedd/files/updatedd-2.6-respect-docdir.patch b/net-dns/updatedd/files/updatedd-2.6-respect-docdir.patch new file mode 100644 index 000000000000..437d326a6e30 --- /dev/null +++ b/net-dns/updatedd/files/updatedd-2.6-respect-docdir.patch @@ -0,0 +1,25 @@ +From 8e484c4b0ceac8e7c37492fdf5e5b89f18451277 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Sat, 14 Jan 2017 01:06:48 -0500 +Subject: [PATCH 1/1] Use the autotools "docdir" in Documentation/Makefile.am. + +--- a/Documentation/Makefile.am ++++ b/Documentation/Makefile.am +@@ -2,12 +2,12 @@ + + ## install documentation + install-data-local: +- $(INSTALL) -d $(DESTDIR)$(datadir)/doc/updatedd +- $(INSTALL) $(srcdir)/updatedd-*.pdf $(DESTDIR)$(datadir)/doc/updatedd +- $(INSTALL) $(srcdir)/updatedd-pppd-rc $(DESTDIR)$(datadir)/doc/updatedd ++ $(INSTALL) -d $(DESTDIR)$(docdir) ++ $(INSTALL) $(srcdir)/updatedd-*.pdf $(DESTDIR)$(docdir) ++ $(INSTALL) $(srcdir)/updatedd-pppd-rc $(DESTDIR)$(docdir) + +-uninstall-local: +- $(RM) -r $(DESTDIR)$(datadir)/doc/updatedd ++uninstall-local:/ ++ $(RM) -r $(DESTDIR)$(datadir)/updatedd + + ## include debian files + EXTRA_DIST = updatedd-2.4-english.pdf updatedd-2.4-german.pdf updatedd-pppd-rc COPYING diff --git a/net-dns/updatedd/metadata.xml b/net-dns/updatedd/metadata.xml index 85e4ed814fa2..3919a9943bb2 100644 --- a/net-dns/updatedd/metadata.xml +++ b/net-dns/updatedd/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <!-- maintainer-needed --> + <upstream> + <remote-id type="savannah-nongnu">updatedd</remote-id> + </upstream> </pkgmetadata> diff --git a/net-dns/updatedd/updatedd-2.6-r6.ebuild b/net-dns/updatedd/updatedd-2.6-r8.ebuild index d55cae76e39c..563946854844 100644 --- a/net-dns/updatedd/updatedd-2.6-r6.ebuild +++ b/net-dns/updatedd/updatedd-2.6-r8.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +inherit autotools DESCRIPTION="Dynamic DNS client with plugins for several dynamic dns services" HOMEPAGE="https://savannah.nongnu.org/projects/updatedd/" @@ -10,20 +12,29 @@ SRC_URI="https://savannah.nongnu.org/download/updatedd/${PN}_${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~arm ppc x86" -IUSE="" -DEPEND="" -RDEPEND="dev-lang/perl - dev-perl/IO-Socket-Timeout" +RDEPEND=" + dev-lang/perl + dev-perl/IO-Socket-Timeout +" PATCHES=( "${FILESDIR}/${P}-options.patch" "${FILESDIR}/fix-ovh-DYNDNSHOST.patch" - "${FILESDIR}/respect-docdir.patch" "${FILESDIR}/set-socket-timeouts-for-ipserv.patch" "${FILESDIR}/fix-ovh-support.patch" + "${FILESDIR}/${P}-respect-docdir.patch" ) -src_configure() { - econf --disable-static +src_prepare() { + default + + # Needed for Clang 16 + eautoreconf +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die } diff --git a/net-dns/valtz/valtz-0.8.ebuild b/net-dns/valtz/valtz-0.8.ebuild index 66aaf7aaee85..7de05ada4b0e 100644 --- a/net-dns/valtz/valtz-0.8.ebuild +++ b/net-dns/valtz/valtz-0.8.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Validation tool for tinydns-data zone files" -SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz" -HOMEPAGE="http://michael.orlitzky.com/code/valtz.xhtml" +SRC_URI="https://michael.orlitzky.com/code/releases/${P}.tar.xz" +HOMEPAGE="https://michael.orlitzky.com/code/valtz.xhtml" LICENSE="BSD" SLOT="0" |