diff --git a/net-misc/frr/files/frr-8.0-c-ares-vtysh.patch b/net-misc/frr/files/frr-8.0-c-ares-vtysh.patch new file mode 100644 index 0000000..6f16233 --- /dev/null +++ b/net-misc/frr/files/frr-8.0-c-ares-vtysh.patch @@ -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) diff --git a/net-misc/frr/frr-8.0.ebuild b/net-misc/frr/frr-8.0.ebuild index 5d31d01..9bfc0df 100644 --- a/net-misc/frr/frr-8.0.ebuild +++ b/net-misc/frr/frr-8.0.ebuild @@ -25,7 +25,6 @@ COMMON_DEPEND=" acct-user/frr dev-libs/json-c:0= grpc? ( net-libs/grpc:= ) - net-dns/c-ares:= nhrp? ( net-dns/c-ares:0= ) pam? ( sys-libs/pam ) rpki? ( >=net-libs/rtrlib-0.6.3[ssh] ) @@ -53,7 +52,10 @@ RDEPEND=" !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() { default @@ -149,3 +151,7 @@ src_install() { # Conflict files, installed by net-libs/libsmi, bug #758383 rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die } + +pkg_postinst() { + optfeature "dns" net-dns/c-ares +}