gentoo auto-resync : 08:12:2022 - 15:15:47

3 files changed, 320 insertions, 0 deletions

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index a571aeed022f..6e3c39e50375 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,6 +1,9 @@
 AUX frr-7.5-ipctl-forwarding.patch 731 BLAKE2B 9c97d7fdc7b7facb59a73f4b693c285ebd91cb0ba8f7fea0ef49d5eddd8660100315ca7d74ece8d553cdd8ad79a9a0b1a4c173c6dedf90e0be2bdc72d948b2be SHA512 56bdeb8a1f350fea3ad8ed0cdba28964b00384878853e584746d8ce80c6f9ea5ca5adc4539e314f7fd82203c08d5f2ce6adeec61dac9a7a28282131d0d371447
+AUX frr-8.4.1-logrotate.patch 2487 BLAKE2B f3eb9b9ce25dd9dd796668ecef5dfeb51b5f3ea3428ef4c03bd78becaf26deb5cb59aa56918fdc3c0230a8905d7edf4a12582ab4e6f7d297e3c94c62b7468b0c SHA512 8658dd1280d201d9f3a7f8caa6c5bf513133a3928ba97334202b0fed84dc03f12c82d76cbb8aeae3f363024d2373161c9bda74e1d9a27a085071c524c9941ad0
 AUX frr-openrc-v1 7078 BLAKE2B d5c0276540fa09318f6e92575dd7e03f3bc6ebfce186d062c2d65fa49c502b3b4de0fd32914ce7c4708bb6f6188296f75d387e0384c142381bb77cfb706c7e1c SHA512 8e6f0e58863402f0169b8a7625d049bf85db60bebe40a42dfb450a1bddfcd6f8f436002de6c1ff599c8f848e4ba85a70e4058cb55a9a49fafb1e69a8e7eb9f57
 AUX frr.pam 969 BLAKE2B 227dc91f51fab504229fa5489486fed1aa393d33c024849724ea3fb934e3fd78ee6c9147240133d458ec52021f13e8a27a2d8a0b4625415007c4595222b815ee SHA512 9a169d58232eba7481aee83d92b4e104b6c4ca95e5b31befe29117fbcebc187ad87c061f37ec7c571ff5702101a329ae0c113cf714e2d0dcd39ca4212734a9ed
 DIST frr-8.2.2.tar.gz 9439460 BLAKE2B 7ea4b44e3d167677e087ac8767c470b91c485e52f9e45513fb6da8498ff3c56e84dd90257eff3b0067c061e7596578968017cbec7de7ea951b6f80134332e1bf SHA512 52d8e82979823f61ec6f117db1eb41b23fd8ad3197ae3f9d2cfa3ad9d96636a3d2f0b36720b2041a9261c8b639ddd48e46a2351ce41cb596f7dc432cddf29256
+DIST frr-8.4.1.tar.gz 9886182 BLAKE2B be270f34e9ffdbf87a10c7bbd73e9f244128821f1c014060880015e4e7e06165dbc1dc3253894bda5dc1a0607a5bdbad21a70532e9019f1e06d0abd24beffff1 SHA512 69f936580d2e7838e1f15fdfa71a4fa00e7acaa93df4cdbd6129560fbcd45f3754cf5d03b4c9331bf4850477560d63d5509d185098583d19fa93d9e960e1483a
 EBUILD frr-8.2.2.ebuild 3482 BLAKE2B 8b392dae2c74f0fc17853ece9d842306ff184c3917a397f3ac62a9d0b6b393cdffe251344452e8be7898c33ddcaaaeeed673de8b00421c02f7bec3b353a52687 SHA512 edf4094fa93cf30deee37a1d51339d917c8d89153901be4a2faf6deb8bd1d4e8bd958b067aeec3c08ecbc55e9b4b207e488b69f42bce09597b296b45b0984a5e
+EBUILD frr-8.4.1.ebuild 3527 BLAKE2B 2551451ff553acbe85db1a8eaece48799fe7d959be6ab01c92db7dfe3da7d760ea5ee55d3ac7d14afbcdb9c1e26128c01b359b434fead263e1164d4c4a679b88 SHA512 4e940eb41ed7e1882474b02df2898d80e7ba95a7d45293ef9f14dee8ec87b725e1c661302a4e6ec6f5d9b932bbef265dba8736e15bd469ad440c9b1b3847676f
 MISC metadata.xml 845 BLAKE2B 5a563fb20d00884598122763e39d8ce4ef6f7a28b811517a4a01b892636c1ec7cfcf3b0e8bccf838882a8fac309bdbda8dd4fd093f7f58795bd0b711087aeff5 SHA512 1ba4423cf6be189aeec21a0f3a6623c48d61c39fca94dc7dc675fcfdd472c6063b3eefe3f11f5b0de385e759a5488f464a413b7ba1bfc8ae9913563bac6dd264
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..f43d14c1e5f7
--- /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.8.0[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
+}