diff --git a/net-dns/redis-knot/Manifest b/net-dns/redis-knot/Manifest index f8dd663f58e7e..b7e5308e8df8d 100644 --- a/net-dns/redis-knot/Manifest +++ b/net-dns/redis-knot/Manifest @@ -1,5 +1,3 @@ -DIST knot-3.5.2.tar.xz 1710680 BLAKE2B 215b09a91f2ba21f23f996df2a1e6ea187f362bfb6dc80d5cd1b45cd84ebf4ccb77f90ff567e91dab36f02aae1a776efcc0aea2a54b830eb85039d0b39ff803f SHA512 4dd8e42088f792459859da807427024ded926c2a8fb5b9fd4596b631a184269e3d84f0cd4be9192f2546977c598c418f8d44cabccbc393f9f7cf2f0dd5adc595 -DIST knot-3.5.2.tar.xz.asc 833 BLAKE2B e5ba45566c403b2a7b477fdf940ce7d13d5ab8901f0e25b3232eaa3bd5a85114679750a1164bd304f872336b152210923c65e7577a7b4dd485250c89f97310ba SHA512 5f6ee7fedc0d5b904572d2f6d47858065cdc4efa7217b4e9dcbb38ae63a1533646ba2b042bb0c1fe533a3caf6ba41c81010616393d2a0adcea77712608931b38 DIST knot-3.5.3.tar.xz 1757736 BLAKE2B eff117f72248b6647eb54a2f0c230b971065205ab6adf2503785efdf045ae548568a95915bfbd594e99501ff7c8ca691e98f372ba4b1f88521ab685e015b4b3b SHA512 7064a18ce10fa9488176592baddfda32b55f6ca2470dce4083c82aca8fae95f568cb9ddd2bb9f55466eeffbb04ea616e67014f44b94f2fb2b8f98f8a419271a3 DIST knot-3.5.3.tar.xz.asc 833 BLAKE2B 661b74b7a460d9993226862d1f7dc2d74ca9e7f9a0057b5f9eae5c4748a2fdc16415212e209a8264e0d49ea4107e6a713ccaba3d3bb91deec3b3e86cc48e1237 SHA512 4ad40aaba569b4e6ccf3b6f264d3e45866855d5c388f6bd8140704ad9db09ef71d271c59704ca8e92bd39c0e7d62894d535b1f4e0642d1db33d113855ac6d6bd DIST knot-3.5.4.tar.xz 1767940 BLAKE2B ddd7b2fdcc2fbd23c3ff3173026883bae4b068eac7b076a641353a0c2f13b525914c6d8df3ea41b339667c28f4f5e70486b51fc7b6eee2de7bdf648b3ec2d3c8 SHA512 2dd51cc2d5c80a9570a8cd89cf094e7445ba60cc44df8152a932da5be2e8734a4c3916d6c36e6dea74031afab5d2af52e64bc7ce9efb93efe752c54ad5a3a818 diff --git a/net-dns/redis-knot/files/redis-knot-3.5.0-opt_gnutls.patch b/net-dns/redis-knot/files/redis-knot-3.5.0-opt_gnutls.patch deleted file mode 100644 index 7163f39faf1ce..0000000000000 --- a/net-dns/redis-knot/files/redis-knot-3.5.0-opt_gnutls.patch +++ /dev/null @@ -1,65 +0,0 @@ -PR pending -https://gitlab.nic.cz/knot/knot-dns/-/merge_requests/1809.patch -GnuTLS is not needed to build the Redis module alone ---- a/src/config.h.in -+++ b/src/config.h.in -@@ -96,6 +96,9 @@ - /* gnutls_early_cipher_get available */ - #undef HAVE_GNUTLS_QUIC - -+/* Define to 1 if GnuTLS is not needed, ie. to build the Redis module alone */ -+#undef DISABLE_GNUTLS -+ - /* Define to 1 if you have the 'initgroups' function. */ - #undef HAVE_INITGROUPS - ---- a/configure.ac -+++ b/configure.ac -@@ -170,7 +170,11 @@ PKG_CHECK_MODULES([gnutls], [gnutls >= 3.6.10], [ - - CFLAGS=$save_CFLAGS - LIBS=$save_LIBS --]) -+], -+ AS_IF([test "$enable_redis" != "module"], -+ [AC_MSG_ERROR([GnuTLS library not found])], -+ [AC_DEFINE([DISABLE_GNUTLS], [1], [Disable GnuTLS support.])]) -+) - AM_CONDITIONAL([ENABLE_PKCS11], [test "$enable_pkcs11" = "yes"]) - - AC_ARG_ENABLE([recvmmsg], ---- a/src/libdnssec/key/keytag.c -+++ b/src/libdnssec/key/keytag.c -@@ -10,7 +10,9 @@ - #include "libdnssec/binary.h" - #include "libdnssec/error.h" - #include "libdnssec/key/dnskey.h" -+#ifndef DISABLE_GNUTLS - #include "libdnssec/shared/shared.h" -+#endif - - /*! - * Compute keytag for RSA/MD5 key. ---- a/src/libdnssec/key/dnskey.h -+++ b/src/libdnssec/key/dnskey.h -@@ -5,7 +5,9 @@ - - #pragma once - -+#ifndef DISABLE_GNUTLS - #include -+#endif - - #include "libdnssec/binary.h" - #include "libdnssec/error.h" -@@ -28,8 +30,10 @@ enum dnskey_rdata_offsets { - int dnskey_rdata_set_pubkey(dnssec_binary_t *rdata, - const dnssec_binary_t *pubkey); - -+#ifndef DISABLE_GNUTLS - /*! - * Create a GnuTLS public key from DNSKEY RDATA. - */ - int dnskey_rdata_to_crypto_key(const dnssec_binary_t *rdata, - gnutls_pubkey_t *key_ptr); -+#endif diff --git a/net-dns/redis-knot/redis-knot-3.5.2.ebuild b/net-dns/redis-knot/redis-knot-3.5.2.ebuild deleted file mode 100644 index fa87a5689e2db..0000000000000 --- a/net-dns/redis-knot/redis-knot-3.5.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools verify-sig - -MY_PN="knot" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="Redis module for Knot DNS" -HOMEPAGE="https://www.knot-dns.cz/ https://gitlab.nic.cz/knot/knot-dns" -SRC_URI=" - https://knot-dns.nic.cz/release/${MY_P}.tar.xz - verify-sig? ( https://knot-dns.nic.cz/release/${MY_P}.tar.xz.asc ) -" -S="${WORKDIR}/${MY_P}" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" - -# no test, it requires a Redis instance and RLTest (not packaged) -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-knot )" - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/${MY_PN}.asc - -PATCHES=( - # https://gitlab.nic.cz/knot/knot-dns/-/merge_requests/1809.patch - "${FILESDIR}"/${PN}-3.5.0-opt_gnutls.patch -) - -# Used to check cpuset_t in sched.h with NetBSD. -# False positive because linux have sched.h too but with cpu_set_t -QA_CONFIG_IMPL_DECL_SKIP=( cpuset_create cpuset_destroy ) - -# because configure.ac is patched -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-daemon - --disable-modules - --disable-utilities - --disable-xdp - --enable-redis=module - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake -C src/redis -} - -src_install() { - emake DESTDIR="${D}" -C src/redis install - - find "${D}" -name '*.la' -delete || die -}