net-misc/frr: version bump

Signed-off-by: Sergey Popov <pinkbyte@gentoo.org>
Closes: https://bugs.gentoo.org/877827

3 files changed, 318 insertions, 0 deletions

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index d651c9560cd3..b6c8e2f882e7 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1 +1,2 @@
 DIST frr-8.2.2.tar.gz 9439460 BLAKE2B 7ea4b44e3d167677e087ac8767c470b91c485e52f9e45513fb6da8498ff3c56e84dd90257eff3b0067c061e7596578968017cbec7de7ea951b6f80134332e1bf SHA512 52d8e82979823f61ec6f117db1eb41b23fd8ad3197ae3f9d2cfa3ad9d96636a3d2f0b36720b2041a9261c8b639ddd48e46a2351ce41cb596f7dc432cddf29256
+DIST frr-8.4.1.tar.gz 9886182 BLAKE2B be270f34e9ffdbf87a10c7bbd73e9f244128821f1c014060880015e4e7e06165dbc1dc3253894bda5dc1a0607a5bdbad21a70532e9019f1e06d0abd24beffff1 SHA512 69f936580d2e7838e1f15fdfa71a4fa00e7acaa93df4cdbd6129560fbcd45f3754cf5d03b4c9331bf4850477560d63d5509d185098583d19fa93d9e960e1483a
diff --git a/net-misc/frr/files/frr-8.4.1-logrotate.patch b/net-misc/frr/files/frr-8.4.1-logrotate.patch
new file mode 100644
index 000000000000..e1507455ae38
--- /dev/null
+++ b/net-misc/frr/files/frr-8.4.1-logrotate.patch
@@ -0,0 +1,168 @@
+--- a/redhat/frr.logrotate	2022-11-18 08:31:08.000000000 +0300
++++ b/redhat/frr.logrotate	2022-12-08 15:49:11.162739743 +0300
+@@ -1,4 +1,5 @@
+ /var/log/frr/frr.log {
++    su frr frr
+     notifempty
+     missingok
+     postrotate
+@@ -7,6 +8,7 @@
+ }
+ 
+ /var/log/frr/zebra.log {
++    su frr frr
+     notifempty
+     missingok
+     postrotate
+@@ -15,6 +17,7 @@
+ }
+ 
+ /var/log/frr/babeld.log {
++    su frr frr
+     notifempty
+     missingok
+     postrotate
+@@ -23,6 +26,7 @@
+ }
+ 
+ /var/log/frr/bgpd.log {
++    su frr frr
+     notifempty
+     missingok
+     postrotate
+@@ -31,6 +35,7 @@
+ }
+ 
+ /var/log/frr/isisd.log {
++    su frr frr
+     notifempty
+     missingok
+     postrotate
+@@ -39,6 +44,7 @@
+ }
+ 
+ /var/log/frr/ospfd.log {
++    su frr frr
+     notifempty
+     missingok
+     postrotate
+@@ -47,6 +53,7 @@
+ }
+ 
+ /var/log/frr/ospf6d.log {
++    su frr frr
+     notifempty
+     missingok
+     postrotate
+@@ -55,6 +62,7 @@
+ }
+ 
+ /var/log/frr/ripd.log {
++    su frr frr
+     notifempty
+     missingok
+     postrotate
+@@ -63,6 +71,7 @@
+ }
+ 
+ /var/log/frr/ripngd.log {
++    su frr frr
+     notifempty
+     missingok
+     postrotate
+@@ -71,6 +80,7 @@
+ }
+ 
+ /var/log/frr/ldpd.log {
++    su frr frr
+     notifempty
+     missingok
+     postrotate
+@@ -79,6 +89,7 @@
+ }
+ 
+ /var/log/frr/nhrpd.log {
++    su frr frr
+     notifempty
+     missingok
+     postrotate
+@@ -87,6 +98,7 @@
+ }
+ 
+ /var/log/frr/eigrpd.log {
++    su frr frr
+     notifempty
+     missingok
+     postrotate
+@@ -95,6 +107,7 @@
+ }
+ 
+ /var/log/frr/bfdd.log {
++    su frr frr
+     notifempty
+     missingok
+     postrotate
+@@ -103,6 +116,7 @@
+ }
+ 
+ /var/log/frr/fabricd.log {
++    su frr frr
+     notifempty
+     missingok
+     postrotate
+@@ -111,6 +125,7 @@
+ }
+ 
+ /var/log/frr/pathd.log {
++    su frr frr
+     notifempty
+     missingok
+     postrotate
+@@ -119,6 +134,7 @@
+ }
+ 
+ /var/log/frr/pbrd.log {
++    su frr frr
+     notifempty
+     missingok
+     postrotate
+@@ -127,6 +143,7 @@
+ }
+ 
+ /var/log/frr/pimd.log {
++    su frr frr
+     notifempty
+     missingok
+     postrotate
+@@ -135,6 +152,7 @@
+ }
+ 
+ /var/log/frr/pim6d.log {
++    su frr frr
+     notifempty
+     missingok
+     postrotate
+@@ -143,6 +161,7 @@
+ }
+ 
+ /var/log/frr/sharpd.log {
++    su frr frr
+     notifempty
+     missingok
+     postrotate
+@@ -151,6 +170,7 @@
+ }
+ 
+ /var/log/frr/staticd.log {
++    su frr frr
+     notifempty
+     missingok
+     postrotate
+@@ -159,6 +179,7 @@
+ }
+ 
+ /var/log/frr/vrrpd.log {
++    su frr frr
+     notifempty
+     missingok
+     postrotate
diff --git a/net-misc/frr/frr-8.4.1.ebuild b/net-misc/frr/frr-8.4.1.ebuild
new file mode 100644
index 000000000000..3fdcec518b69
--- /dev/null
+++ b/net-misc/frr/frr-8.4.1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit autotools pam python-single-r1 systemd
+
+DESCRIPTION="The FRRouting Protocol Suite"
+HOMEPAGE="https://frrouting.org/"
+SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz"
+# FRR tarballs have weird format.
+S="${WORKDIR}/frr-${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	acct-user/frr
+	dev-libs/json-c:0=
+	>=net-libs/libyang-2.0.0
+	sys-libs/libcap
+	sys-libs/readline:0=
+	virtual/libcrypt:=
+	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:= )
+"
+BDEPEND="
+	~dev-util/clippy-${PV}
+	sys-devel/flex
+	app-alternatives/yacc
+	doc? ( dev-python/sphinx )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+	test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	$(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]')
+	!net-misc/quagga
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch
+	"${FILESDIR}"/${PN}-8.4.1-logrotate.patch
+)
+
+src_prepare() {
+	default
+
+	python_fix_shebang tools
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		--with-pkg-extra-version="-gentoo"
+		--enable-configfile-mask=0640
+		--enable-logfile-mask=0640
+		--prefix="${EPREFIX}"/usr
+		--libdir="${EPREFIX}"/usr/lib/frr
+		--sbindir="${EPREFIX}"/usr/lib/frr
+		--libexecdir="${EPREFIX}"/usr/lib/frr
+		--sysconfdir="${EPREFIX}"/etc/frr
+		--localstatedir="${EPREFIX}"/run/frr
+		--with-moduledir="${EPREFIX}"/usr/lib/frr/modules
+		--with-clippy="${BROOT}"/usr/bin/clippy
+		--enable-user=frr
+		--enable-group=frr
+		--enable-vty-group=frr
+		--enable-multipath=64
+		$(use_enable doc)
+		$(use_enable fpm)
+		$(use_enable grpc)
+		$(use_enable ipv6 ospf6d)
+		$(use_enable ipv6 ripngd)
+		$(use_enable ipv6 rtadv)
+		$(use_enable kernel_linux realms)
+		$(use_enable nhrp nhrpd)
+		$(usex ospfapi '--enable-ospfclient' '' '' '')
+		$(use_enable rpki)
+		$(use_enable snmp)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	# Install user documentation if asked
+	use doc && dodoc -r doc/user/_build/html
+
+	# Create configuration directory with correct permissions
+	keepdir /etc/frr
+	fowners frr:frr /etc/frr
+	fperms 775 /etc/frr
+
+	# Create logs directory with the correct permissions
+	keepdir /var/log/frr
+	fowners frr:frr /var/log/frr
+	fperms 775 /var/log/frr
+
+	# Install the default configuration files
+	insinto /etc/frr
+	doins tools/etc/frr/vtysh.conf
+	doins tools/etc/frr/frr.conf
+	doins tools/etc/frr/daemons
+
+	# Fix permissions/owners.
+	fowners frr:frr /etc/frr/vtysh.conf
+	fowners frr:frr /etc/frr/frr.conf
+	fowners frr:frr /etc/frr/daemons
+	fperms 640 /etc/frr/vtysh.conf
+	fperms 640 /etc/frr/frr.conf
+	fperms 640 /etc/frr/daemons
+
+	# Install logrotate configuration
+	insinto /etc/logrotate.d
+	newins redhat/frr.logrotate frr
+
+	# Install PAM configuration file
+	use pam && newpamd "${FILESDIR}"/frr.pam frr
+
+	# Install init scripts
+	systemd_dounit tools/frr.service
+	newinitd "${FILESDIR}"/frr-openrc-v1 frr
+
+	# Conflict files, installed by net-libs/libsmi, bug #758383
+	rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die
+}