mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-09 00:07:57 +03:00
net-dns/redis-knot: drop 3.5.0
Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/44813 Closes: https://github.com/gentoo/gentoo/pull/44813 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Nicolas PARLANT
Sam James
parent
7b61cb3183
commit
3d7cbed0a3
@ -1,5 +1,3 @@
|
||||
DIST knot-3.5.0.tar.xz 1716348 BLAKE2B 681de5b8947de9d104e949ac99f15cacea7be36f3c1a03c0328aa2894222c920b37bc1123afd1705fb2430def912287cfe0c760e9e4862d430477a7da4fdf314 SHA512 740c8f2d92921e68de3e2e62b7c714bad7ca41884e59236df02e5935889cc4f2102d8693dda2b700e1bfafda71d8760ec4337cc80d42c493d37eef5d0516d1ad
|
||||
DIST knot-3.5.0.tar.xz.asc 833 BLAKE2B e183ed714215df6e18bdfe839a085e7be5a7a411097a8de6632eed3330a2d4f031bbbdac37345d9ed97f9eefba61dcb7996d6a7eeef6d5dc4260007cd4251903 SHA512 44675f89bcb6186bf96f8297ffc898bbb08b7a33470038797abee5b3eadc8e20c321e2bebb43ac7b2cb560beccbbf4dca5446b0964de89670cf63e0c7c910aff
|
||||
DIST knot-3.5.1.tar.xz 1676008 BLAKE2B aa6b9d173c7fc0ff7011691ac6178a8b24ae7482c9ccc87ee4b7cc1932d5fa678a367462098f2c2e28865aa5b37bc5ba1b787d8fc4d222cfd1aeb1da1452ebc8 SHA512 f4f42425fe20a0632489a6de642993515a7914b0392553dc8842e3ec2a4ab0c515dd3e11799c90a7f36e79d83fa92998aa6f03a5c6c527d1520c2cb6388fc9ba
|
||||
DIST knot-3.5.1.tar.xz.asc 833 BLAKE2B 02f6fe62cdff94c8f274a203ff3873b0d10abc52c8fb2817325ebfcf56e16b048db46c63874894e2922db3a7db3ecfb25155f54c0958d2095054aff50aff555f SHA512 740528e26e999bf4c12cc2995838f8d1bf0aaac68d3bc823f45090ed5f498bb3cb294b4c07fa0056dd8b7033a7502f800cbdf608276fbf40c79d566035aca8d3
|
||||
DIST knot-3.5.2.tar.xz 1710680 BLAKE2B 215b09a91f2ba21f23f996df2a1e6ea187f362bfb6dc80d5cd1b45cd84ebf4ccb77f90ff567e91dab36f02aae1a776efcc0aea2a54b830eb85039d0b39ff803f SHA512 4dd8e42088f792459859da807427024ded926c2a8fb5b9fd4596b631a184269e3d84f0cd4be9192f2546977c598c418f8d44cabccbc393f9f7cf2f0dd5adc595
|
||||
|
||||
@ -1,62 +0,0 @@
|
||||
PR merged
|
||||
https://gitlab.nic.cz/knot/knot-dns/-/merge_requests/1808.patch
|
||||
From bd5df719f331c5aa78fbd1ca1dadfe6dd727b94d Mon Sep 17 00:00:00 2001
|
||||
From: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
|
||||
Date: Fri, 19 Sep 2025 10:36:55 +0200
|
||||
Subject: [PATCH] Make redis fully optional
|
||||
|
||||
Add options :
|
||||
*client (only) for a knot package
|
||||
*module (only) for a redis-knot package
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -261,21 +261,23 @@ AS_IF([test "$enable_reuseport" = yes],[
|
||||
|
||||
# Redis zone backend support
|
||||
AC_ARG_ENABLE([redis],
|
||||
- AS_HELP_STRING([--enable-redis=auto|yes|no], [enable Redis support [default=auto]]),
|
||||
+ AS_HELP_STRING([--enable-redis=auto|yes|client|module|no], [enable Redis support [default=auto]]),
|
||||
[], [enable_redis=auto])
|
||||
|
||||
PKG_CHECK_MODULES([hiredis], [hiredis], [have_hiredis=yes], [have_hiredis=no])
|
||||
|
||||
AS_CASE([$enable_redis],
|
||||
- [auto], [AS_IF([test "$have_hiredis" = "yes"], [enable_redis=yes], [enable_redis=no])],
|
||||
- [yes], [AS_IF([test "$have_hiredis" = "yes"], [enable_redis=yes], [AC_MSG_ERROR([libhiredis not available])])],
|
||||
+ [auto], [AS_IF([test "$have_hiredis" = "yes"], [enable_redis=yes], [enable_redis=no])],
|
||||
+ [yes], [AS_IF([test "$have_hiredis" = "yes"], [enable_redis=yes], [AC_MSG_ERROR([libhiredis not available])])],
|
||||
+ [client], [AS_IF([test "$have_hiredis" = "yes"], [enable_redis=client], [AC_MSG_ERROR([libhiredis not available])])],
|
||||
+ [module], [AS_IF([test "$enable_shared" = "yes"], [enable_redis=module], [AC_MSG_ERROR([link mode has to be 'shared'])])],
|
||||
[no], [],
|
||||
[*], [AC_MSG_ERROR([Invalid value of --enable-redis.])]
|
||||
)
|
||||
AM_CONDITIONAL([ENABLE_REDIS], [test "$enable_redis" != "no"])
|
||||
-AM_CONDITIONAL([ENABLE_REDIS_MODULE], [test "$enable_redis" != "no" && test "$enable_shared" = "yes"])
|
||||
+AM_CONDITIONAL([ENABLE_REDIS_MODULE], [test "$enable_redis" != "no" && test "$enable_redis" != "client" && test "$enable_shared" = "yes"])
|
||||
|
||||
-AS_IF([test "$enable_redis" = yes],[
|
||||
+AS_IF([test "$enable_redis" = yes -o "$enable_redis" = client],[
|
||||
AC_DEFINE([ENABLE_REDIS], [1], [Enable Redis support.])
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <hiredis/hiredis.h>
|
||||
#if (HIREDIS_MAJOR < 1) || (HIREDIS_MAJOR == 1 && HIREDIS_MINOR < 1)
|
||||
@@ -283,7 +285,7 @@ AS_IF([test "$enable_redis" = yes],[
|
||||
#endif]])],
|
||||
[AC_DEFINE([ENABLE_REDIS_TLS], [1], [Enable Redis TLS support.])],
|
||||
[enable_redis="yes (no TLS)"])
|
||||
- AS_IF([test "$enable_shared" = yes],[
|
||||
+ AS_IF([test "$enable_redis" = yes && test "$enable_shared" = yes],[
|
||||
enable_redis="${enable_redis} module"
|
||||
])
|
||||
])
|
||||
@@ -515,7 +517,7 @@ PKG_CHECK_MODULES([lmdb], [lmdb >= 0.9.15], [], [
|
||||
CPPFLAGS="$save_CPPFLAGS"
|
||||
LIBS="$save_LIBS"
|
||||
|
||||
- AS_IF([test "$have_lmdb" = "no"], [
|
||||
+ AS_IF([test "$have_lmdb" = "no" && test "$enable_redis" != "module"], [
|
||||
AC_MSG_ERROR([lmdb library not found])
|
||||
])
|
||||
])
|
||||
--
|
||||
GitLab
|
||||
|
||||
@ -1,73 +0,0 @@
|
||||
# Copyright 2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit autotools edo toolchain-funcs 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="
|
||||
dev-build/libtool
|
||||
verify-sig? ( sec-keys/openpgp-keys-knot )
|
||||
"
|
||||
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/${MY_PN}.asc
|
||||
|
||||
PATCHES=(
|
||||
# PR merged https://gitlab.nic.cz/knot/knot-dns/-/merge_requests/1808.patch
|
||||
"${FILESDIR}"/${PN}-3.5.0-full_redis_opt.patch
|
||||
# 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
|
||||
eautoconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf --disable-daemon --disable-modules --disable-utilities --disable-xdp --enable-redis=module
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
pushd src/redis || die
|
||||
|
||||
# mimic src/redis/Makefile.am
|
||||
edo ${LIBTOOL:=libtool} --tag=CC --mode=compile $(tc-getCC) \
|
||||
${CFLAGS} -fvisibility=hidden \
|
||||
-I../../src -include ../../src/config.h \
|
||||
-c -o knot_la-knot.lo knot.c
|
||||
|
||||
edo ${LIBTOOL:=libtool} --tag=CC --mode=link $(tc-getCC) \
|
||||
-module -shared -avoid-version \
|
||||
${LDFLAGS} \
|
||||
-o knot.la \
|
||||
-rpath "${EPREFIX}"/usr/$(get_libdir)/knot/redis \
|
||||
knot_la-knot.lo
|
||||
|
||||
popd || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
exeinto /usr/$(get_libdir)/knot/redis
|
||||
doexe src/redis/.libs/knot.so
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user