From 4ec74b5044ab756bc5f28f1e277257ce968580ae Mon Sep 17 00:00:00 2001
From: Alarig Le Lay <alarig@swordarmor.fr>
Date: Wed, 25 Aug 2021 17:48:51 +0200
Subject: [PATCH] net-misc/frr: patches seem quite buggy

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Alarig Le Lay <alarig@swordarmor.fr
---
 .../frr/files/frr-7.5-ipctl-forwarding.patch  | 22 ------------------
 net-misc/frr/files/frr-8.0-c-ares-vtysh.patch | 20 ----------------
 net-misc/frr/frr-8.0.ebuild                   | 23 ++++++-------------
 3 files changed, 7 insertions(+), 58 deletions(-)
 delete mode 100644 net-misc/frr/files/frr-7.5-ipctl-forwarding.patch
 delete mode 100644 net-misc/frr/files/frr-8.0-c-ares-vtysh.patch

diff --git a/net-misc/frr/files/frr-7.5-ipctl-forwarding.patch b/net-misc/frr/files/frr-7.5-ipctl-forwarding.patch
deleted file mode 100644
index f6b726b..0000000
--- a/net-misc/frr/files/frr-7.5-ipctl-forwarding.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix for missing definitions on some Hardened configurations
-Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=437292
-
-diff -Naur quagga-0.99.16.orig/zebra/ipforward_sysctl.c quagga-0.99.16/zebra/ipforward_sysctl.c
---- quagga-0.99.16.orig/zebra/ipforward_sysctl.c	2010-03-11 12:11:32.000000000 -0500
-+++ quagga-0.99.16/zebra/ipforward_sysctl.c	2010-03-11 12:11:39.000000000 -0500
-@@ -31,6 +31,15 @@
- 
- #define MIB_SIZ 4
- 
-+/* Fix for recent (2.6.14) kernel headers */
-+#ifndef IPCTL_FORWARDING
-+    #define IPCTL_FORWARDING       NET_IPV4_FORWARD
-+#endif
-+
-+#ifndef IP6CTL_FORWARDING
-+    #define IP6CTL_FORWARDING      NET_IPV6_FORWARDING
-+#endif
-+
- extern struct zebra_privs_t zserv_privs;
- 
- /* IPv4 forwarding control MIB. */
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
deleted file mode 100644
index 6f16233..0000000
--- a/net-misc/frr/files/frr-8.0-c-ares-vtysh.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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 016205a..79ceda3 100644
--- a/net-misc/frr/frr-8.0.ebuild
+++ b/net-misc/frr/frr-8.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-inherit autotools optfeature pam python-single-r1 systemd
+inherit autotools pam python-single-r1 systemd
 
 DESCRIPTION="The FRRouting Protocol Suite"
 HOMEPAGE="https://frrouting.org/"
@@ -21,17 +21,17 @@ RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
-	>=net-libs/libyang-2.0.0
 	acct-user/frr
 	dev-libs/json-c:0=
-	grpc? ( net-libs/grpc:= )
-	nhrp? ( net-dns/c-ares:0= )
-	pam? ( sys-libs/pam )
-	rpki? ( >=net-libs/rtrlib-0.6.3[ssh] )
-	snmp? ( net-analyzer/net-snmp:= )
+	net-dns/c-ares:0=
 	sys-libs/libcap
 	sys-libs/readline:0=
 	virtual/libcrypt:=
+	>=net-libs/libyang-2.0.0
+	grpc? ( net-libs/grpc:= )
+	pam? ( sys-libs/pam )
+	rpki? ( >=net-libs/rtrlib-0.6.3[ssh] )
+	snmp? ( net-analyzer/net-snmp:= )
 "
 
 BDEPEND="
@@ -52,11 +52,6 @@ RDEPEND="
 	!net-misc/quagga
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch
-	"${FILESDIR}"/${P}-c-ares-vtysh.patch
-)
-
 src_prepare() {
 	default
 
@@ -151,7 +146,3 @@ 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
-}