net-misc/frr: patch for c-ares

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Alarig Le Lay <alarig@swordarmor.fr
This commit is contained in:
Alarig Le Lay 2021-08-23 17:56:16 +02:00
parent 904f16a6fe
commit 6eaf2bf006
Signed by: alarig
GPG key ID: 7AFE62C6DF8BCDEC
2 changed files with 28 additions and 2 deletions

View file

@ -0,0 +1,20 @@
diff --git a/lib/subdir.am b/lib/subdir.am
index 75f3d91b9..05910349e 100644
--- a/lib/subdir.am
+++ b/lib/subdir.am
@@ -144,7 +144,6 @@ vtysh_scan += \
lib/log_vty.c \
lib/nexthop_group.c \
lib/plist.c \
- lib/resolver.c \
lib/routemap.c \
lib/routemap_cli.c \
lib/spf_backoff.c \
@@ -333,6 +332,7 @@ lib_libfrrsnmp_la_SOURCES = \
if CARES
lib_LTLIBRARIES += lib/libfrrcares.la
pkginclude_HEADERS += lib/resolver.h
+vtysh_scan += lib/resolver.c
endif
lib_libfrrcares_la_CFLAGS = $(AM_CFLAGS) $(CARES_CFLAGS)

View file

@ -25,7 +25,6 @@ COMMON_DEPEND="
acct-user/frr acct-user/frr
dev-libs/json-c:0= dev-libs/json-c:0=
grpc? ( net-libs/grpc:= ) grpc? ( net-libs/grpc:= )
net-dns/c-ares:=
nhrp? ( net-dns/c-ares:0= ) nhrp? ( net-dns/c-ares:0= )
pam? ( sys-libs/pam ) pam? ( sys-libs/pam )
rpki? ( >=net-libs/rtrlib-0.6.3[ssh] ) rpki? ( >=net-libs/rtrlib-0.6.3[ssh] )
@ -53,7 +52,10 @@ RDEPEND="
!net-misc/quagga !net-misc/quagga
" "
PATCHES=( "${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch ) PATCHES=(
"${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch
"${FILESDIR}"/${P}-c-ares-vtysh.patch
)
src_prepare() { src_prepare() {
default default
@ -149,3 +151,7 @@ src_install() {
# Conflict files, installed by net-libs/libsmi, bug #758383 # Conflict files, installed by net-libs/libsmi, bug #758383
rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die
} }
pkg_postinst() {
optfeature "dns" net-dns/c-ares
}