gentoo auto-resync : 26:03:2025 - 00:31:47

4 files changed, 168 insertions, 12 deletions

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 6f4647dcacf4..c02761f8657d 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -5,12 +5,14 @@ AUX frr-openrc-v2 7079 BLAKE2B abbad56f0715b79ba5ba24df373ccb8ab63caa12b04d89269
 AUX frr.pam 969 BLAKE2B 227dc91f51fab504229fa5489486fed1aa393d33c024849724ea3fb934e3fd78ee6c9147240133d458ec52021f13e8a27a2d8a0b4625415007c4595222b815ee SHA512 9a169d58232eba7481aee83d92b4e104b6c4ca95e5b31befe29117fbcebc187ad87c061f37ec7c571ff5702101a329ae0c113cf714e2d0dcd39ca4212734a9ed
 DIST frr-10.0.3.tar.gz 10968934 BLAKE2B 18ef81af21b9ca2861dd66c7c3d4ec7faa2ba322793d1a7d4f16e967be01f0776b82e7cffb70ba289770008ad64f44117fb108ba4f88fdcb444483e89deac6ac SHA512 ca2011d720d1069a574dc4a5d87c07b7a9556d1eac7078d5f4a2eed1bac458eea41b5f1c3d0a6df78fe3fae0dab45ce5b701b60534cb219919f67ee4e22bd1a5
 DIST frr-10.1.2.tar.gz 11046539 BLAKE2B db983becc4c00256cfc87032252f85f763d9acfdc5eb8488206b32fe8caddfb8e9371808d929cb708b4df1a32d2a2df148d036f3eef98ff432812ae6a865d539 SHA512 257844687c0132819bedf559a527217d4c01abfa6b98c787f18f24e5006a53d9d3e561b22ab36631d691ba53d3f206c1d52d8020cb1b962d7ad117b159f674c6
+DIST frr-10.1.3.tar.gz 11054898 BLAKE2B d0315061fddd2fb7d44cc9fd58044203a54778f716a341e3b73f15427f17ac73aaab0887d5d805f2d80c26688e4b49445467e8007d35d1f0aca785e296a2a181 SHA512 90dc1be0ef975b55e4e4442106543ed38b0f51b30dc250a619639d7e37de339801728672ced4f7b197141921b22ad86471a5a2422421daacd6e53f04e1de5179
 DIST frr-10.2.1.tar.gz 11178677 BLAKE2B 8bcc8ccf8febee1012d94a9f3de40cc177bec1af464cd935303df8859a72607d03e5f9030f05bed5d56a7a413a0029479f538b3c0b35acc4a66295b4229f6be1 SHA512 8544280a0c536e8688cbf2811d96cdc2fa3413f662013bb1b58cb02d4d56a08d98e870b39e477f6b0294e6aceb5dcc99c5facdeee165ce7597c2150ebb79101e
-DIST frr-9.1.2.tar.gz 10790677 BLAKE2B dfa4967ee0e0bbecea016b9deeb70b1c1b9e409469de145050602608dddd41857be946e8df5c8a594dfaf6a124729af55d7ce4483e6fe6edc41125f09d9dabd2 SHA512 e0ed613090140ece181bff077a7067a00a5fca648ec6627c02d815060087497c68712c1ba244fa1534cdbcef49db92bd9432545d05027dc4b04db4f423726882
-DIST frr-9.1.3.tar.gz 10790704 BLAKE2B e8e68aa7bd4c4c9e01d82c2ef2788fb66fad0332000fc61bcc094af22628a09ce4dc28d41891a4a48e8493a6377f9fa02c5b782cf8a989fd7f54484ecb24e0eb SHA512 5f07ae1dcea2bca8de30dba97011de999a08cebdd1b2dd05f1eb24c4dbde2746a51de54867d77a6b5a205c8d13636589e0513c360d453143fd64802d5956a682
+DIST frr-10.2.2.tar.gz 11184873 BLAKE2B 610060a8dd352085e084b8d5d367b357a0432525a296af5be2c8333f2a00934291c2b0ce1d2cc46e8eaab41e43fdba2374464d6944e9379d2d521b359beb3ac7 SHA512 992e75438ebb0c337eb00c64d6a1097427ce3279c2b3b5b592dbc52d1e7b978776e86dfa5d3a5062bb29b25b6d1f68d8423cd9e5fa93c04cf1207fc362dcf6a2
+DIST frr-10.3.tar.gz 11374042 BLAKE2B 85f4d29b390497df3e730b7114fd0ddf6f083571d21315d4760c87d5e792e3db6d415a407126de8ef6252266bb3bbfd8c29285e3b1aeb850f6e3458167f6c7fd SHA512 1c78f688bd143b12bb2135da10d4937ad25ccdb0c5cfe046e966f1b4a889c5b177da59fb8bc7b8956c71c95a05147af2af4f14cdd4b4fc48c57e0581411158b1
 EBUILD frr-10.0.3.ebuild 3527 BLAKE2B c44ee14d2871f82e741fcf0fcad2d57b0cd82a416bd75d0420cdf494aa202c4916b214c44f1865f0bb8fcddc11d810f1329fefdeed80f65d7236383eed152e1d SHA512 7b6289b8cc03cc4de104de5ad34e65c2c46eb56447d103659c21b31dcfe2bdf45226f5c34011f8bdf76862625d720a23e78c8023e6b80d7d368108d0d8568e74
 EBUILD frr-10.1.2.ebuild 3527 BLAKE2B c44ee14d2871f82e741fcf0fcad2d57b0cd82a416bd75d0420cdf494aa202c4916b214c44f1865f0bb8fcddc11d810f1329fefdeed80f65d7236383eed152e1d SHA512 7b6289b8cc03cc4de104de5ad34e65c2c46eb56447d103659c21b31dcfe2bdf45226f5c34011f8bdf76862625d720a23e78c8023e6b80d7d368108d0d8568e74
+EBUILD frr-10.1.3.ebuild 3528 BLAKE2B 5fc91e30aa76feed58aac262370003284f76b1d21ec9d2c4a6f26be582cb38ba9f02b92ec75ea32a23e253283899897443f9dcb05f60b4b6b202812d89d60dec SHA512 b651f951bbb413fe987930f06a4297263ce7c7b24fc60ef4e4a798ea5799f5fc3f57db66f5be8f7e4540a92c06c8a2b0b6d2ad9a383f5f301429d1ed4dd35c74
 EBUILD frr-10.2.1.ebuild 3528 BLAKE2B 5fc91e30aa76feed58aac262370003284f76b1d21ec9d2c4a6f26be582cb38ba9f02b92ec75ea32a23e253283899897443f9dcb05f60b4b6b202812d89d60dec SHA512 b651f951bbb413fe987930f06a4297263ce7c7b24fc60ef4e4a798ea5799f5fc3f57db66f5be8f7e4540a92c06c8a2b0b6d2ad9a383f5f301429d1ed4dd35c74
-EBUILD frr-9.1.2.ebuild 3403 BLAKE2B 5534c9fa814ca3c614fbd2c77b9894c5b0228d7d50aecb5c755fdca5ad8a7eda10edbc3515d14574345f1af92290ca5bbe97c8f167bd072e8ce3f1b807f0b416 SHA512 684f516c8e0086ebc5753d6d06bfc2f302dd2e3093319dbda31d78626b6ec1f984b7064be43ca36c2658723367e460e523ba98429d058a59ff482d4bf0dd6556
-EBUILD frr-9.1.3.ebuild 3342 BLAKE2B 007f01df37c030d85dd45a8c1a4e6954b45892d6e201e5ba0af6d5a534e4d58ca815619b1885a4ec581a3a598cedd8afd56c365badcac101455b8257beb0b9ae SHA512 9c5196dd3550f77e030dcee21399f3e3169e6c7a96ef67514f89996eb31a65ddf9c15389569a1d7e7c2cc82e7f26f45357d1aef0a4154dc7978cbcdd3bf67dca
+EBUILD frr-10.2.2.ebuild 3528 BLAKE2B 5fc91e30aa76feed58aac262370003284f76b1d21ec9d2c4a6f26be582cb38ba9f02b92ec75ea32a23e253283899897443f9dcb05f60b4b6b202812d89d60dec SHA512 b651f951bbb413fe987930f06a4297263ce7c7b24fc60ef4e4a798ea5799f5fc3f57db66f5be8f7e4540a92c06c8a2b0b6d2ad9a383f5f301429d1ed4dd35c74
+EBUILD frr-10.3.ebuild 3528 BLAKE2B 5fc91e30aa76feed58aac262370003284f76b1d21ec9d2c4a6f26be582cb38ba9f02b92ec75ea32a23e253283899897443f9dcb05f60b4b6b202812d89d60dec SHA512 b651f951bbb413fe987930f06a4297263ce7c7b24fc60ef4e4a798ea5799f5fc3f57db66f5be8f7e4540a92c06c8a2b0b6d2ad9a383f5f301429d1ed4dd35c74
 MISC metadata.xml 1001 BLAKE2B 32254a7ceb76fb6869dc4b140b54968001eaee2347cde49597a6a599f98b5efcb3e0102e3c7cbd9969a1bc137228be07efb56f791b490ddbaaa8e5c2cf13fba4 SHA512 e63bee06b1eb237fb9e5872a16c294d3378b1a48da1d950e6cc7d6734128c81d019d66fc8be02b9935c9a4e19552f20db335a3296070bcebf4621ffcb3efe91b
diff --git a/net-misc/frr/frr-9.1.3.ebuild b/net-misc/frr/frr-10.1.3.ebuild
index 271bab6bccbd..6e1d6a35e541 100644
--- a/net-misc/frr/frr-9.1.3.ebuild
+++ b/net-misc/frr/frr-10.1.3.ebuild
@@ -24,8 +24,7 @@ COMMON_DEPEND="
 	acct-user/frr
 	dev-libs/json-c:0=
 	dev-libs/protobuf-c:0=
-	>=net-libs/libyang-2.0.0
-	<net-libs/libyang-2.1.111
+	>=net-libs/libyang-2.1.128
 	sys-libs/libcap
 	sys-libs/readline:0=
 	virtual/libcrypt:=
@@ -142,5 +141,9 @@ src_install() {
 	newinitd "${FILESDIR}"/frr-openrc-v2 frr
 
 	# Conflict files, installed by net-libs/libsmi, bug #758383
+	# Files from frr seems to be newer.
 	rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die
+	rm "${ED}"/usr/share/yang/ietf-netconf.yang || die
+	rm "${ED}"/usr/share/yang/ietf-netconf-with-defaults.yang || die
+	rm "${ED}"/usr/share/yang/ietf-netconf-acm.yang || die
 }
diff --git a/net-misc/frr/frr-9.1.2.ebuild b/net-misc/frr/frr-10.2.2.ebuild
index 7808e05d8baa..6e1d6a35e541 100644
--- a/net-misc/frr/frr-9.1.2.ebuild
+++ b/net-misc/frr/frr-10.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020-2024 Gentoo Authors
+# Copyright 2020-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit autotools pam python-single-r1 systemd
 
 DESCRIPTION="The FRRouting Protocol Suite"
@@ -14,7 +14,7 @@ S="${WORKDIR}/frr-${P}"
 
 LICENSE="GPL-2+"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc fpm grpc nhrp ospfapi pam rpki snmp test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
@@ -24,8 +24,7 @@ COMMON_DEPEND="
 	acct-user/frr
 	dev-libs/json-c:0=
 	dev-libs/protobuf-c:0=
-	>=net-libs/libyang-2.0.0
-	<net-libs/libyang-2.1.111
+	>=net-libs/libyang-2.1.128
 	sys-libs/libcap
 	sys-libs/readline:0=
 	virtual/libcrypt:=
@@ -50,7 +49,6 @@ DEPEND="
 "
 RDEPEND="
 	${COMMON_DEPEND}
-	$(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]')
 "
 
 PATCHES=(
@@ -143,5 +141,9 @@ src_install() {
 	newinitd "${FILESDIR}"/frr-openrc-v2 frr
 
 	# Conflict files, installed by net-libs/libsmi, bug #758383
+	# Files from frr seems to be newer.
 	rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die
+	rm "${ED}"/usr/share/yang/ietf-netconf.yang || die
+	rm "${ED}"/usr/share/yang/ietf-netconf-with-defaults.yang || die
+	rm "${ED}"/usr/share/yang/ietf-netconf-acm.yang || die
 }
diff --git a/net-misc/frr/frr-10.3.ebuild b/net-misc/frr/frr-10.3.ebuild
new file mode 100644
index 000000000000..6e1d6a35e541
--- /dev/null
+++ b/net-misc/frr/frr-10.3.ebuild
@@ -0,0 +1,149 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+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/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc fpm grpc 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=
+	dev-libs/protobuf-c:0=
+	>=net-libs/libyang-2.1.128
+	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="
+	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}]')
+		dev-util/cunit
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch
+	"${FILESDIR}"/${PN}-8.4.1-logrotate.patch
+	"${FILESDIR}"/${PN}-9.1-mimic-gnu-basename-api-for-non-glibc.patch
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	mallinfo # No functional impact.
+	mallinfo2
+)
+
+src_prepare() {
+	default
+
+	python_fix_shebang tools
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		LEX=flex
+		--with-pkg-extra-version="-gentoo"
+		--enable-configfile-mask=0640
+		--enable-logfile-mask=0640
+		--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
+		--enable-user=frr
+		--enable-group=frr
+		--enable-vty-group=frr
+		--enable-multipath=64
+		$(use_enable doc)
+		$(use_enable fpm)
+		$(use_enable grpc)
+		$(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_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	default
+}
+
+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
+	# Create logs directory with the correct permissions
+	diropts -ofrr -gfrr -m0775
+	keepdir /var/log/frr /etc/frr
+
+	# Install the default configuration files
+	insinto /etc/frr
+	doins tools/etc/frr/{vtysh.conf,frr.conf,daemons}
+
+	# Fix permissions/owners.
+	fowners frr:frr /etc/frr/{vtysh.conf,frr.conf,daemons}
+	fperms 640 /etc/frr/{vtysh.conf,frr.conf,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-v2 frr
+
+	# Conflict files, installed by net-libs/libsmi, bug #758383
+	# Files from frr seems to be newer.
+	rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die
+	rm "${ED}"/usr/share/yang/ietf-netconf.yang || die
+	rm "${ED}"/usr/share/yang/ietf-netconf-with-defaults.yang || die
+	rm "${ED}"/usr/share/yang/ietf-netconf-acm.yang || die
+}