[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2024-05-28 Thread Sam James
commit: 425e313e29d22504187d6ddd6a4453b1114e22b3
Author: Sam James  gentoo  org>
AuthorDate: Tue May 28 22:00:45 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 28 22:00:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=425e313e

net-misc/frr: Stabilize 9.1 amd64, #933020

Signed-off-by: Sam James  gentoo.org>

 net-misc/frr/frr-9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/frr/frr-9.1.ebuild b/net-misc/frr/frr-9.1.ebuild
index ba22b713cd72..71a6eb44675c 100644
--- a/net-misc/frr/frr-9.1.ebuild
+++ b/net-misc/frr/frr-9.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/frr-${P}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2024-04-23 Thread Michał Górny
commit: 6c0a706e92dea85fd8e7c86971027d2511011147
Author: Alarig Le Lay  swordarmor  fr>
AuthorDate: Fri Feb  9 11:41:20 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Apr 23 08:53:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c0a706e

net-misc/frr: add 9.1

I’m also merging dev-util/clippy into net-misc/frr because it’s only
used there and the tarball is the same.

Signed-off-by: Alarig Le Lay  swordarmor.fr>
Closes: https://bugs.gentoo.org/929724
Closes: https://github.com/gentoo/gentoo/pull/36265
Signed-off-by: Michał Górny  gentoo.org>

 net-misc/frr/Manifest   |   1 +
 net-misc/frr/frr-9.1.ebuild | 135 
 2 files changed, 136 insertions(+)

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 33080fee8f38..ed66d088a7ac 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1 +1,2 @@
 DIST frr-9.0.2.tar.gz 10341186 BLAKE2B 
e9c32bf48dc0adc7dd6c23ad1a2779065c762dc6e461a3f86d6b7afbef245345dc65b33d9dd5b499d4c4a7fb3b80a4416bdec9b42e7d15f2864d80c088e2ad4f
 SHA512 
2cfd1a63cf073b8767fd67d9992d9a775d856234a532b13699304b6b1f15eb68bf1301f2f4c503b151fd5c8191bff67aeac9c7a4dc4a3ddb06f9a5db081423b9
+DIST frr-9.1.tar.gz 10779477 BLAKE2B 
ba64f9455c38441f8cadce4eed435fb86344244e98bd1b675335887fb098be29adc035d722d3c128e136a4c6b0aa1adcbdc0e22815702e52170da940a5caf20a
 SHA512 
77b278a3ea87da9dfd7b87e4f9ae67f08ed0f24809f6dd228d2ab2e2c29e2b3191d59d50fc474e53e159ac6c79c302481b462125d0657889516f07b8e05e8562

diff --git a/net-misc/frr/frr-9.1.ebuild b/net-misc/frr/frr-9.1.ebuild
new file mode 100644
index ..70a91a1508e4
--- /dev/null
+++ b/net-misc/frr/frr-9.1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+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=
+   dev-libs/protobuf-c:0=
+   >=net-libs/libyang-2.0.0
+   =net-libs/rtrlib-0.8.0[ssh] )
+   snmp? ( net-analyzer/net-snmp:= )
+"
+BDEPEND="
+   app-alternatives/lex
+   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}]')
+"
+
+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=(
+   --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 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
+   # 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 

[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2024-04-23 Thread Michał Górny
commit: 0e2183c57fcf78854f7476ae39f83537566d61b1
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Apr 23 08:51:01 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Apr 23 08:53:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e2183c5

net-misc/frr: Disable pytest plugin autoloading

Signed-off-by: Michał Górny  gentoo.org>

 net-misc/frr/frr-9.1.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/net-misc/frr/frr-9.1.ebuild b/net-misc/frr/frr-9.1.ebuild
index 70a91a1508e4..ba22b713cd72 100644
--- a/net-misc/frr/frr-9.1.ebuild
+++ b/net-misc/frr/frr-9.1.ebuild
@@ -99,6 +99,11 @@ src_compile() {
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



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2024-03-22 Thread Andreas Sturmlechner
commit: 82f669615665a4fc5a70f8357b6fb15a99a34585
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Thu Mar 21 06:07:36 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar 22 09:43:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82f66961

net-misc/frr: drop 9.0, 9.0.1

Bug: https://bugs.gentoo.org/916902
Closes: https://bugs.gentoo.org/914714
Closes: https://bugs.gentoo.org/913887
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35848
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-misc/frr/Manifest |   2 -
 net-misc/frr/frr-9.0.1.ebuild | 151 --
 net-misc/frr/frr-9.0.ebuild   | 151 --
 3 files changed, 304 deletions(-)

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 376770103a91..33080fee8f38 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,3 +1 @@
-DIST frr-9.0.1.tar.gz 10334150 BLAKE2B 
c5f0d092421cdaea400e669973da3d53d9875871488be3b5e8c2c9afa78bf357a775671756eacb94372c5067a8a1284cb4feb4927988e0f1a42d19239a871f3b
 SHA512 
fa1884529a98c8e5ad2dab7f6f67246844ea34ba4d68e3a907a01d43e0eec9317104107f5f18e4b61c11d2cbb4d20eac1e8aef6e4a2b2e54efcad245ee3fb6b9
 DIST frr-9.0.2.tar.gz 10341186 BLAKE2B 
e9c32bf48dc0adc7dd6c23ad1a2779065c762dc6e461a3f86d6b7afbef245345dc65b33d9dd5b499d4c4a7fb3b80a4416bdec9b42e7d15f2864d80c088e2ad4f
 SHA512 
2cfd1a63cf073b8767fd67d9992d9a775d856234a532b13699304b6b1f15eb68bf1301f2f4c503b151fd5c8191bff67aeac9c7a4dc4a3ddb06f9a5db081423b9
-DIST frr-9.0.tar.gz 10332694 BLAKE2B 
82221df6da189d5e687af4618af71933eb512413126dfb312bfcc663e5fc6f85e29c33da84117f40598452e6033cb24e9cba8d28f00d63fee2bf45a43babef17
 SHA512 
d3af6c24abbc8745f9646a22c023bd1d0e155776ffd09c9dd0b81b93c383723c9e7dd987319551db85dab5fd45d47cbcbf47a1ae1b6861cd7930bc27f18d2e25

diff --git a/net-misc/frr/frr-9.0.1.ebuild b/net-misc/frr/frr-9.0.1.ebuild
deleted file mode 100644
index 7daa9904e2b3..
--- a/net-misc/frr/frr-9.0.1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..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=
-   dev-libs/protobuf-c:0=
-   >=net-libs/libyang-2.0.0
-   =net-libs/rtrlib-0.8.0[ssh] )
-   snmp? ( net-analyzer/net-snmp:= )
-"
-BDEPEND="
-   ~dev-util/clippy-${PV}
-   app-alternatives/lex
-   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() {
- 

[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2024-03-20 Thread Joonas Niilola
commit: 9c810d18f831c31382f7841db770fcbf99a558d3
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Mar 21 05:53:55 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Mar 21 05:53:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c810d18

net-misc/frr: Stabilize 9.0.2 amd64, #923780

Signed-off-by: Joonas Niilola  gentoo.org>

 net-misc/frr/frr-9.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/frr/frr-9.0.2.ebuild b/net-misc/frr/frr-9.0.2.ebuild
index 3ee3c19c8be1..87227382bd64 100644
--- a/net-misc/frr/frr-9.0.2.ebuild
+++ b/net-misc/frr/frr-9.0.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/frr-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2024-02-09 Thread Joonas Niilola
commit: 33153928ae0598d624bc93f15b7fd77bcaf40a8d
Author: Alarig Le Lay  swordarmor  fr>
AuthorDate: Fri Feb  9 11:31:15 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Feb  9 13:17:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33153928

net-misc/frr: add 9.0.2 (CVE-2023-47234, CVE-2023-47235)

Bug: https://bugs.gentoo.org/916902
Signed-off-by: Alarig Le Lay  swordarmor.fr>
Closes: https://github.com/gentoo/gentoo/pull/33752
Signed-off-by: Joonas Niilola  gentoo.org>

 net-misc/frr/Manifest |   1 +
 net-misc/frr/frr-9.0.2.ebuild | 150 ++
 2 files changed, 151 insertions(+)

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index d91332d2ffe3..376770103a91 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,2 +1,3 @@
 DIST frr-9.0.1.tar.gz 10334150 BLAKE2B 
c5f0d092421cdaea400e669973da3d53d9875871488be3b5e8c2c9afa78bf357a775671756eacb94372c5067a8a1284cb4feb4927988e0f1a42d19239a871f3b
 SHA512 
fa1884529a98c8e5ad2dab7f6f67246844ea34ba4d68e3a907a01d43e0eec9317104107f5f18e4b61c11d2cbb4d20eac1e8aef6e4a2b2e54efcad245ee3fb6b9
+DIST frr-9.0.2.tar.gz 10341186 BLAKE2B 
e9c32bf48dc0adc7dd6c23ad1a2779065c762dc6e461a3f86d6b7afbef245345dc65b33d9dd5b499d4c4a7fb3b80a4416bdec9b42e7d15f2864d80c088e2ad4f
 SHA512 
2cfd1a63cf073b8767fd67d9992d9a775d856234a532b13699304b6b1f15eb68bf1301f2f4c503b151fd5c8191bff67aeac9c7a4dc4a3ddb06f9a5db081423b9
 DIST frr-9.0.tar.gz 10332694 BLAKE2B 
82221df6da189d5e687af4618af71933eb512413126dfb312bfcc663e5fc6f85e29c33da84117f40598452e6033cb24e9cba8d28f00d63fee2bf45a43babef17
 SHA512 
d3af6c24abbc8745f9646a22c023bd1d0e155776ffd09c9dd0b81b93c383723c9e7dd987319551db85dab5fd45d47cbcbf47a1ae1b6861cd7930bc27f18d2e25

diff --git a/net-misc/frr/frr-9.0.2.ebuild b/net-misc/frr/frr-9.0.2.ebuild
new file mode 100644
index ..3ee3c19c8be1
--- /dev/null
+++ b/net-misc/frr/frr-9.0.2.ebuild
@@ -0,0 +1,150 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..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=
+   dev-libs/protobuf-c:0=
+   >=net-libs/libyang-2.0.0
+   =net-libs/rtrlib-0.8.0[ssh] )
+   snmp? ( net-analyzer/net-snmp:= )
+"
+BDEPEND="
+   ~dev-util/clippy-${PV}
+   app-alternatives/lex
+   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}]')
+"
+
+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 

[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2023-12-26 Thread Jakov Smolić
commit: 02d1144cbefd0bbcceca458c708844a310524b8b
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Dec 26 21:57:50 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Dec 27 00:02:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02d1144c

net-misc/frr: drop myself as a maintainer

Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/frr/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/net-misc/frr/metadata.xml b/net-misc/frr/metadata.xml
index 872896f7668c..9cd33eb40e66 100644
--- a/net-misc/frr/metadata.xml
+++ b/net-misc/frr/metadata.xml
@@ -5,10 +5,6 @@
Alarig Le Lay
ala...@swordarmor.fr

-   
-   jsmo...@gentoo.org
-   Jakov Smolić
-   

j...@uls.co.za
Jaco Kroon



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/files/

2023-10-15 Thread Conrad Kostecki
commit: e8f592b09f1fe55eb9caf1bddd0a451a6adb3858
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Oct 15 16:19:36 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Oct 15 22:01:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8f592b0

net-misc/frr: remove unused file

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/33351
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-misc/frr/files/frr-openrc-v1 | 301 ---
 1 file changed, 301 deletions(-)

diff --git a/net-misc/frr/files/frr-openrc-v1 b/net-misc/frr/files/frr-openrc-v1
deleted file mode 100644
index 3f9da62e2a18..
--- a/net-misc/frr/files/frr-openrc-v1
+++ /dev/null
@@ -1,301 +0,0 @@
-#!/sbin/openrc-run
-#
-# FRR OpenRC init script.
-#
-# Copyright (C) 2020 Rafael F. Zalamena
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; only version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-description="FRR initialization script."
-
-# FRR variables.
-frr_dir="/usr/lib/frr"
-frr_state_dir="/run/frr"
-config_file="/etc/frr/frr.conf"
-daemon_file="/etc/frr/daemons"
-daemon_db="/run/frrdb"
-vty_config_file="/etc/frr/vtysh.conf"
-frr_reload="$frr_dir/frr-reload.py"
-frr_reload_log="$frr_state_dir/reload.log"
-
-# Don't change profile here, use $daemon_file. This is the default.
-frr_profile="traditional"
-
-# watchfrr variables.
-watchfrr_daemons=''
-watchfrr_pidfile="$frr_state_dir/watchfrr.pid"
-
-#
-# Helpers.
-#
-_check_daemon_binary() {
-  local daemon=$1
-
-  [ -x "$frr_dir/$daemon" ] && return 0
-
-  eerror "No binary found for $daemon in $frr_dir"
-  return 1
-}
-
-_load_daemon_list() {
-  # Load FRR daemons configuration file.
-  while read line <&3 ; do
-case $line in
-  ""|"#"*)
-# Skip empty/commented lines.
-continue
-;;
-
-  *d=*|*_instances=*|*_options=*|*_wrap=*)
-# Load daemon options.
-eval "$line"
-;;
-
-  MAX_FDS=*|frr_profile=*|vtysh_enable=*)
-# Load misc configuration.
-eval "$line"
-;;
-esac
-  done 3< $daemon_file
-
-  # `zebra` and `staticd` are mandatory.
-  _check_daemon_binary 'zebra' || return 1
-  _check_daemon_binary 'staticd' || return 1
-  watchfrr_daemons='zebra staticd'
-
-  # Create the watchfrr command line.
-  for daemon in \
-babeld bfdd bgpd eigrpd fabricd isisd ldpd nhrpd ospfd ospf6d pbrd \
-pimd ripd ripngd sharpd vrrpd \
-  ; do
-# Trick to read variable name with variable.
-cdaemon=$(eval echo \$$daemon)
-cdaemon_instances=$(eval echo \$${daemon}_instances)
-
-# Add daemon to command line if specified.
-if [ ! -z $cdaemon ] && [ $cdaemon = 'yes' ]; then
-  _check_daemon_binary $daemon || return 1
-
-  # Multi instance daemon handling.
-  if [ ! -z $cdaemon_instances ]; then
-for instance in $(echo $cdaemon_instances | tr ',' ' '); do
-  watchfrr_daemons="$watchfrr_daemons $daemon-$instance"
-done
-   continue
-  fi
-
-  # Single instance daemon handling.
-  watchfrr_daemons="$watchfrr_daemons $daemon"
-  continue
-fi
-  done
-}
-
-_frr_start() {
-  # Apply MAX_FDS configuration if set.
-  if [ ! -z $MAX_FDS ]; then
-veinfo "  Setting maximum file descriptors to ${MAX_FDS}"
-ulimit -n $MAX_FDS >/dev/null 2>/dev/null
-  fi
-
-  # Save started daemons to state database.
-  rm -f -- $daemon_db
-  for daemon in $watchfrr_daemons; do
-echo $daemon >> $daemon_db
-veinfo "  Starting $daemon..."
-  done
-
-  veinfo "  Starting watchfrr..."
-
-  # Start watchfrr which will start all configured daemons.
-  eval $all_wrap $frr_dir/watchfrr -d -F $frr_profile $watchfrr_daemons
-
-  veinfo "  Loading configuration..."
-
-  # After starting the daemons, lets load the configuration.
-  if [ $vtysh_enable = 'yes' ]; then
-vtysh -b -n
-  else
-veinfo "  Configuration loading disabled (vtysh_enable=$vtysh_enable)"
-  fi
-}
-
-_get_pid() {
-  local daemon=$1
-  local pid_file="$frr_state_dir/$daemon.pid"
-
-  # Test for file existence.
-  if [ ! -r "$pid_file" ]; then
-eerror "Failed to find or read $daemon pid file"
-return 1
-  fi
-
-  # Get PID if any.
-  pid=$(cat $pid_file)
-  if [ -z $pid ]; then
-eerror "$daemon PID file empty"
-return 1
-  fi
-
-  return 0
-}
-
-_stop_daemon() {
-  

[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2023-10-11 Thread Jakov Smolić
commit: 24834dfcef377c82918f558d41a516898e3640f9
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Oct 11 20:57:30 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Oct 11 21:06:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24834dfc

net-misc/frr: add 9.0.1

Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/frr/Manifest |   1 +
 net-misc/frr/frr-9.0.1.ebuild | 151 ++
 2 files changed, 152 insertions(+)

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 4110279680e9..e32dc48b2c0b 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,3 +1,4 @@
 DIST frr-8.5.2.tar.gz 10076639 BLAKE2B 
2e2aca4e42757f66c9ca4725826c6cc1d611930490eed2a175ca5b56910f2c09a9d842b2a9370a64a9fdac6a6314bd4573be609d14dbf956049d9fbf49310404
 SHA512 
1afa6ca1a41096aa47dc2fc39ab87290b3cbf634a1632e7910a5b69d2816998fbccbca616f261a410aa146a21dd26d12b7e6812da4ec08545b1500f8b546b972
 DIST frr-8.5.tar.gz 10068379 BLAKE2B 
ed7aa538997bdbfde0370f36a8980ad3ae882a2325cdc7c3b2bdba9d6a43cd9ca04ff96b94b7827e06593a15c104cdadbd2632e136eb2d68e7ed87095a9294a4
 SHA512 
13e2ea8642fc00b565e9a36d2d59abe5d0e11caf646199cd928184fda2de004bda9892ae8a2f91870d5ac218bb127725663b693e4d764e5b21c942bb20b8d66f
+DIST frr-9.0.1.tar.gz 10334150 BLAKE2B 
c5f0d092421cdaea400e669973da3d53d9875871488be3b5e8c2c9afa78bf357a775671756eacb94372c5067a8a1284cb4feb4927988e0f1a42d19239a871f3b
 SHA512 
fa1884529a98c8e5ad2dab7f6f67246844ea34ba4d68e3a907a01d43e0eec9317104107f5f18e4b61c11d2cbb4d20eac1e8aef6e4a2b2e54efcad245ee3fb6b9
 DIST frr-9.0.tar.gz 10332694 BLAKE2B 
82221df6da189d5e687af4618af71933eb512413126dfb312bfcc663e5fc6f85e29c33da84117f40598452e6033cb24e9cba8d28f00d63fee2bf45a43babef17
 SHA512 
d3af6c24abbc8745f9646a22c023bd1d0e155776ffd09c9dd0b81b93c383723c9e7dd987319551db85dab5fd45d47cbcbf47a1ae1b6861cd7930bc27f18d2e25

diff --git a/net-misc/frr/frr-9.0.1.ebuild b/net-misc/frr/frr-9.0.1.ebuild
new file mode 100644
index ..3e71c240c475
--- /dev/null
+++ b/net-misc/frr/frr-9.0.1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..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=
+   dev-libs/protobuf-c:0=
+   >=net-libs/libyang-2.0.0
+   =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 

[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2023-10-11 Thread Jakov Smolić
commit: 9feff6dd849d3a2fcf03f9b8b819087ac66a6bf8
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Oct 11 20:58:34 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Oct 11 21:06:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9feff6dd

net-misc/frr: drop 8.5, 8.5.2-r1

Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/frr/Manifest|   2 -
 net-misc/frr/frr-8.5.2-r1.ebuild | 150 ---
 net-misc/frr/frr-8.5.ebuild  | 149 --
 3 files changed, 301 deletions(-)

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index e32dc48b2c0b..d91332d2ffe3 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,4 +1,2 @@
-DIST frr-8.5.2.tar.gz 10076639 BLAKE2B 
2e2aca4e42757f66c9ca4725826c6cc1d611930490eed2a175ca5b56910f2c09a9d842b2a9370a64a9fdac6a6314bd4573be609d14dbf956049d9fbf49310404
 SHA512 
1afa6ca1a41096aa47dc2fc39ab87290b3cbf634a1632e7910a5b69d2816998fbccbca616f261a410aa146a21dd26d12b7e6812da4ec08545b1500f8b546b972
-DIST frr-8.5.tar.gz 10068379 BLAKE2B 
ed7aa538997bdbfde0370f36a8980ad3ae882a2325cdc7c3b2bdba9d6a43cd9ca04ff96b94b7827e06593a15c104cdadbd2632e136eb2d68e7ed87095a9294a4
 SHA512 
13e2ea8642fc00b565e9a36d2d59abe5d0e11caf646199cd928184fda2de004bda9892ae8a2f91870d5ac218bb127725663b693e4d764e5b21c942bb20b8d66f
 DIST frr-9.0.1.tar.gz 10334150 BLAKE2B 
c5f0d092421cdaea400e669973da3d53d9875871488be3b5e8c2c9afa78bf357a775671756eacb94372c5067a8a1284cb4feb4927988e0f1a42d19239a871f3b
 SHA512 
fa1884529a98c8e5ad2dab7f6f67246844ea34ba4d68e3a907a01d43e0eec9317104107f5f18e4b61c11d2cbb4d20eac1e8aef6e4a2b2e54efcad245ee3fb6b9
 DIST frr-9.0.tar.gz 10332694 BLAKE2B 
82221df6da189d5e687af4618af71933eb512413126dfb312bfcc663e5fc6f85e29c33da84117f40598452e6033cb24e9cba8d28f00d63fee2bf45a43babef17
 SHA512 
d3af6c24abbc8745f9646a22c023bd1d0e155776ffd09c9dd0b81b93c383723c9e7dd987319551db85dab5fd45d47cbcbf47a1ae1b6861cd7930bc27f18d2e25

diff --git a/net-misc/frr/frr-8.5.2-r1.ebuild b/net-misc/frr/frr-8.5.2-r1.ebuild
deleted file mode 100644
index 3d4d9aba14d7..
--- a/net-misc/frr/frr-8.5.2-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..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
-   sys-apps/util-linux
-"
-
-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)
-   

[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2023-08-27 Thread Jakov Smolić
commit: a65a7c992f38e82b1a8dd242ea78283a7ea34f80
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun Aug 27 11:18:49 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Aug 27 11:18:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a65a7c99

net-misc/frr: Install POSIX-compatible init script

Closes: https://bugs.gentoo.org/913102
Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/frr/frr-9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/frr/frr-9.0.ebuild b/net-misc/frr/frr-9.0.ebuild
index 660d036fbe0b..73df8c4dd6f6 100644
--- a/net-misc/frr/frr-9.0.ebuild
+++ b/net-misc/frr/frr-9.0.ebuild
@@ -144,7 +144,7 @@ src_install() {
 
# Install init scripts
systemd_dounit tools/frr.service
-   newinitd "${FILESDIR}"/frr-openrc-v1 frr
+   newinitd "${FILESDIR}"/frr-openrc-v2 frr
 
# Conflict files, installed by net-libs/libsmi, bug #758383
rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2023-08-27 Thread Jakov Smolić
commit: 3be33cda8a2de9a4e596e8ef294f20a73ad4ec56
Author: Alarig Le Lay  swordarmor  fr>
AuthorDate: Sun Aug 27 10:19:28 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Aug 27 10:38:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3be33cda

net-misc/frr: add 9.0

Signed-off-by: Alarig Le Lay  swordarmor.fr>
Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/frr/Manifest   |   1 +
 net-misc/frr/frr-9.0.ebuild | 151 
 2 files changed, 152 insertions(+)

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 3c484721b244..4feffad67131 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,3 +1,4 @@
 DIST frr-8.4.2.tar.gz 9893223 BLAKE2B 
670fb131c2959b0ce4f3133ef38caeb7832275844b16f8582a693033f5466ad0eb98ab45ed9615e0a121ab80bf034edafe7ee816c47d767bd8a13b52f3138eac
 SHA512 
1ee9d17ef3b85c5c10df624a6560bcacb2b5daa3d6231e457f06d9eb6e5ccf375064a46e809d851c23cb6daf7a4299d1f25be589992ef729e80f9bad41a8d7f7
 DIST frr-8.5.2.tar.gz 10076639 BLAKE2B 
2e2aca4e42757f66c9ca4725826c6cc1d611930490eed2a175ca5b56910f2c09a9d842b2a9370a64a9fdac6a6314bd4573be609d14dbf956049d9fbf49310404
 SHA512 
1afa6ca1a41096aa47dc2fc39ab87290b3cbf634a1632e7910a5b69d2816998fbccbca616f261a410aa146a21dd26d12b7e6812da4ec08545b1500f8b546b972
 DIST frr-8.5.tar.gz 10068379 BLAKE2B 
ed7aa538997bdbfde0370f36a8980ad3ae882a2325cdc7c3b2bdba9d6a43cd9ca04ff96b94b7827e06593a15c104cdadbd2632e136eb2d68e7ed87095a9294a4
 SHA512 
13e2ea8642fc00b565e9a36d2d59abe5d0e11caf646199cd928184fda2de004bda9892ae8a2f91870d5ac218bb127725663b693e4d764e5b21c942bb20b8d66f
+DIST frr-9.0.tar.gz 10332694 BLAKE2B 
82221df6da189d5e687af4618af71933eb512413126dfb312bfcc663e5fc6f85e29c33da84117f40598452e6033cb24e9cba8d28f00d63fee2bf45a43babef17
 SHA512 
d3af6c24abbc8745f9646a22c023bd1d0e155776ffd09c9dd0b81b93c383723c9e7dd987319551db85dab5fd45d47cbcbf47a1ae1b6861cd7930bc27f18d2e25

diff --git a/net-misc/frr/frr-9.0.ebuild b/net-misc/frr/frr-9.0.ebuild
new file mode 100644
index ..660d036fbe0b
--- /dev/null
+++ b/net-misc/frr/frr-9.0.ebuild
@@ -0,0 +1,151 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..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=
+   dev-libs/protobuf-c:0=
+   >=net-libs/libyang-2.0.0
+   =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
+}
+

[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/, net-misc/frr/files/

2023-08-27 Thread Jakov Smolić
commit: bc88ee555c3d20b16a41b8bae57e8ecb08d97911
Author: Alarig Le Lay  swordarmor  fr>
AuthorDate: Sun Aug 27 10:20:24 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Aug 27 10:38:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc88ee55

net-misc/frr: drop 8.4.2

Signed-off-by: Alarig Le Lay  swordarmor.fr>
Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/frr/Manifest |   1 -
 net-misc/frr/files/frr-8.4.2-musl-gcc12.patch |  21 
 net-misc/frr/frr-8.4.2.ebuild | 150 --
 3 files changed, 172 deletions(-)

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 4feffad67131..4110279680e9 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,4 +1,3 @@
-DIST frr-8.4.2.tar.gz 9893223 BLAKE2B 
670fb131c2959b0ce4f3133ef38caeb7832275844b16f8582a693033f5466ad0eb98ab45ed9615e0a121ab80bf034edafe7ee816c47d767bd8a13b52f3138eac
 SHA512 
1ee9d17ef3b85c5c10df624a6560bcacb2b5daa3d6231e457f06d9eb6e5ccf375064a46e809d851c23cb6daf7a4299d1f25be589992ef729e80f9bad41a8d7f7
 DIST frr-8.5.2.tar.gz 10076639 BLAKE2B 
2e2aca4e42757f66c9ca4725826c6cc1d611930490eed2a175ca5b56910f2c09a9d842b2a9370a64a9fdac6a6314bd4573be609d14dbf956049d9fbf49310404
 SHA512 
1afa6ca1a41096aa47dc2fc39ab87290b3cbf634a1632e7910a5b69d2816998fbccbca616f261a410aa146a21dd26d12b7e6812da4ec08545b1500f8b546b972
 DIST frr-8.5.tar.gz 10068379 BLAKE2B 
ed7aa538997bdbfde0370f36a8980ad3ae882a2325cdc7c3b2bdba9d6a43cd9ca04ff96b94b7827e06593a15c104cdadbd2632e136eb2d68e7ed87095a9294a4
 SHA512 
13e2ea8642fc00b565e9a36d2d59abe5d0e11caf646199cd928184fda2de004bda9892ae8a2f91870d5ac218bb127725663b693e4d764e5b21c942bb20b8d66f
 DIST frr-9.0.tar.gz 10332694 BLAKE2B 
82221df6da189d5e687af4618af71933eb512413126dfb312bfcc663e5fc6f85e29c33da84117f40598452e6033cb24e9cba8d28f00d63fee2bf45a43babef17
 SHA512 
d3af6c24abbc8745f9646a22c023bd1d0e155776ffd09c9dd0b81b93c383723c9e7dd987319551db85dab5fd45d47cbcbf47a1ae1b6861cd7930bc27f18d2e25

diff --git a/net-misc/frr/files/frr-8.4.2-musl-gcc12.patch 
b/net-misc/frr/files/frr-8.4.2-musl-gcc12.patch
deleted file mode 100644
index 3c9374aefd6d..
--- a/net-misc/frr/files/frr-8.4.2-musl-gcc12.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/FRRouting/frr/pull/12741
-
-From def86a45a473a45bf8ac39ac4b82be3d09ae9cae Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Sat, 4 Feb 2023 23:29:59 +
-Subject: [PATCH] pceplib: add  include for time_t
-
-Fixes build on musl. Used for time_t in the header.
-
-Bug: https://bugs.gentoo.org/862558
 a/pceplib/pcep_utils_counters.h
-+++ b/pceplib/pcep_utils_counters.h
-@@ -30,6 +30,7 @@
- 
- #include 
- #include 
-+#include 
- 
- #ifdef __cplusplus
- extern "C" {
-

diff --git a/net-misc/frr/frr-8.4.2.ebuild b/net-misc/frr/frr-8.4.2.ebuild
deleted file mode 100644
index b0ae3ed58713..
--- a/net-misc/frr/frr-8.4.2.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..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
-   "${FILESDIR}"/${PN}-8.4.2-musl-gcc12.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
-   

[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/files/, net-misc/frr/

2023-07-24 Thread Jakov Smolić
commit: dab354ffbad5069f6a4de1330fe2b33e7619525e
Author: Alarig Le Lay  swordarmor  fr>
AuthorDate: Mon Jul 17 19:49:29 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Jul 24 07:48:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dab354ff

net-misc/frr: Switch the init from ulimit to prlimit

Suggested-by: Jaco Kroon  uls.co.za>
Signed-off-by: Alarig Le Lay  swordarmor.fr>
Closes: https://bugs.gentoo.org/841431
Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/frr/files/frr-openrc-v2   | 301 +
 .../frr/{frr-8.5.2.ebuild => frr-8.5.2-r1.ebuild}  |   3 +-
 2 files changed, 303 insertions(+), 1 deletion(-)

diff --git a/net-misc/frr/files/frr-openrc-v2 b/net-misc/frr/files/frr-openrc-v2
new file mode 100644
index ..24e326ed84a7
--- /dev/null
+++ b/net-misc/frr/files/frr-openrc-v2
@@ -0,0 +1,301 @@
+#!/sbin/openrc-run
+#
+# FRR OpenRC init script.
+#
+# Copyright (C) 2020 Rafael F. Zalamena
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; only version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+description="FRR initialization script."
+
+# FRR variables.
+frr_dir="/usr/lib/frr"
+frr_state_dir="/run/frr"
+config_file="/etc/frr/frr.conf"
+daemon_file="/etc/frr/daemons"
+daemon_db="/run/frrdb"
+vty_config_file="/etc/frr/vtysh.conf"
+frr_reload="$frr_dir/frr-reload.py"
+frr_reload_log="$frr_state_dir/reload.log"
+
+# Don't change profile here, use $daemon_file. This is the default.
+frr_profile="traditional"
+
+# watchfrr variables.
+watchfrr_daemons=''
+watchfrr_pidfile="$frr_state_dir/watchfrr.pid"
+
+#
+# Helpers.
+#
+_check_daemon_binary() {
+  local daemon=$1
+
+  [ -x "$frr_dir/$daemon" ] && return 0
+
+  eerror "No binary found for $daemon in $frr_dir"
+  return 1
+}
+
+_load_daemon_list() {
+  # Load FRR daemons configuration file.
+  while read line <&3 ; do
+case $line in
+  ""|"#"*)
+# Skip empty/commented lines.
+continue
+;;
+
+  *d=*|*_instances=*|*_options=*|*_wrap=*)
+# Load daemon options.
+eval "$line"
+;;
+
+  MAX_FDS=*|frr_profile=*|vtysh_enable=*)
+# Load misc configuration.
+eval "$line"
+;;
+esac
+  done 3< $daemon_file
+
+  # `zebra` and `staticd` are mandatory.
+  _check_daemon_binary 'zebra' || return 1
+  _check_daemon_binary 'staticd' || return 1
+  watchfrr_daemons='zebra staticd'
+
+  # Create the watchfrr command line.
+  for daemon in \
+babeld bfdd bgpd eigrpd fabricd isisd ldpd nhrpd ospfd ospf6d pbrd \
+pimd ripd ripngd sharpd vrrpd \
+  ; do
+# Trick to read variable name with variable.
+cdaemon=$(eval echo \$$daemon)
+cdaemon_instances=$(eval echo \$${daemon}_instances)
+
+# Add daemon to command line if specified.
+if [ ! -z $cdaemon ] && [ $cdaemon = 'yes' ]; then
+  _check_daemon_binary $daemon || return 1
+
+  # Multi instance daemon handling.
+  if [ ! -z $cdaemon_instances ]; then
+for instance in $(echo $cdaemon_instances | tr ',' ' '); do
+  watchfrr_daemons="$watchfrr_daemons $daemon-$instance"
+done
+   continue
+  fi
+
+  # Single instance daemon handling.
+  watchfrr_daemons="$watchfrr_daemons $daemon"
+  continue
+fi
+  done
+}
+
+_frr_start() {
+  # Apply MAX_FDS configuration if set.
+  if [ ! -z $MAX_FDS ]; then
+veinfo "  Setting maximum file descriptors to ${MAX_FDS}"
+prlimit -n $MAX_FDS >/dev/null 2>/dev/null
+  fi
+
+  # Save started daemons to state database.
+  rm -f -- $daemon_db
+  for daemon in $watchfrr_daemons; do
+echo $daemon >> $daemon_db
+veinfo "  Starting $daemon..."
+  done
+
+  veinfo "  Starting watchfrr..."
+
+  # Start watchfrr which will start all configured daemons.
+  eval $all_wrap $frr_dir/watchfrr -d -F $frr_profile $watchfrr_daemons
+
+  veinfo "  Loading configuration..."
+
+  # After starting the daemons, lets load the configuration.
+  if [ $vtysh_enable = 'yes' ]; then
+vtysh -b -n
+  else
+veinfo "  Configuration loading disabled (vtysh_enable=$vtysh_enable)"
+  fi
+}
+
+_get_pid() {
+  local daemon=$1
+  local pid_file="$frr_state_dir/$daemon.pid"
+
+  # Test for file existence.
+  if [ ! -r "$pid_file" ]; then
+eerror "Failed to find or read $daemon pid file"
+return 1
+  fi
+
+  # Get PID if any.
+  pid=$(cat $pid_file)
+  if [ -z $pid ]; then
+

[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2023-07-14 Thread Jakov Smolić
commit: 01ca556819e1a62de06f7ecfe3d2c95922d053f7
Author: Alarig Le Lay  swordarmor  fr>
AuthorDate: Fri Jul 14 10:52:28 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Jul 14 13:31:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01ca5568

net-misc/frr: Update maintainers

Signed-off-by: Alarig Le Lay  swordarmor.fr>
Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/frr/metadata.xml | 12 
 1 file changed, 12 insertions(+)

diff --git a/net-misc/frr/metadata.xml b/net-misc/frr/metadata.xml
index ddcddee54aea..872896f7668c 100644
--- a/net-misc/frr/metadata.xml
+++ b/net-misc/frr/metadata.xml
@@ -1,10 +1,22 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
+   
+   Alarig Le Lay
+   ala...@swordarmor.fr
+   

jsmo...@gentoo.org
Jakov Smolić

+   
+   j...@uls.co.za
+   Jaco Kroon
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   

Enable gRPC plugin
Build Next Hop Resolution Protocol 
daemon



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2023-07-14 Thread Jakov Smolić
commit: 809b9b80e1e0f3ff4b5b404988e1c79df41e3024
Author: Alarig Le Lay  swordarmor  fr>
AuthorDate: Fri Jul 14 09:50:52 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Jul 14 13:24:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=809b9b80

net-misc/frr: add 8.5.2

Signed-off-by: Alarig Le Lay  swordarmor.fr>
Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/frr/Manifest |   1 +
 net-misc/frr/frr-8.5.2.ebuild | 149 ++
 2 files changed, 150 insertions(+)

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index ee1284097b5f..3c484721b244 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,2 +1,3 @@
 DIST frr-8.4.2.tar.gz 9893223 BLAKE2B 
670fb131c2959b0ce4f3133ef38caeb7832275844b16f8582a693033f5466ad0eb98ab45ed9615e0a121ab80bf034edafe7ee816c47d767bd8a13b52f3138eac
 SHA512 
1ee9d17ef3b85c5c10df624a6560bcacb2b5daa3d6231e457f06d9eb6e5ccf375064a46e809d851c23cb6daf7a4299d1f25be589992ef729e80f9bad41a8d7f7
+DIST frr-8.5.2.tar.gz 10076639 BLAKE2B 
2e2aca4e42757f66c9ca4725826c6cc1d611930490eed2a175ca5b56910f2c09a9d842b2a9370a64a9fdac6a6314bd4573be609d14dbf956049d9fbf49310404
 SHA512 
1afa6ca1a41096aa47dc2fc39ab87290b3cbf634a1632e7910a5b69d2816998fbccbca616f261a410aa146a21dd26d12b7e6812da4ec08545b1500f8b546b972
 DIST frr-8.5.tar.gz 10068379 BLAKE2B 
ed7aa538997bdbfde0370f36a8980ad3ae882a2325cdc7c3b2bdba9d6a43cd9ca04ff96b94b7827e06593a15c104cdadbd2632e136eb2d68e7ed87095a9294a4
 SHA512 
13e2ea8642fc00b565e9a36d2d59abe5d0e11caf646199cd928184fda2de004bda9892ae8a2f91870d5ac218bb127725663b693e4d764e5b21c942bb20b8d66f

diff --git a/net-misc/frr/frr-8.5.2.ebuild b/net-misc/frr/frr-8.5.2.ebuild
new file mode 100644
index ..dedac1e7cf84
--- /dev/null
+++ b/net-misc/frr/frr-8.5.2.ebuild
@@ -0,0 +1,149 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..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 && 

[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2023-07-11 Thread Jakov Smolić
commit: 5cb600aa5de7880febc532a83cad3e20da79c686
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Jul 11 14:02:21 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Jul 11 14:02:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cb600aa

net-misc/frr: Stabilize 8.5 amd64, #908169

Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/frr/frr-8.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/frr/frr-8.5.ebuild b/net-misc/frr/frr-8.5.ebuild
index dedac1e7cf84..7ad15586bc9b 100644
--- a/net-misc/frr/frr-8.5.ebuild
+++ b/net-misc/frr/frr-8.5.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/frr-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2023-05-05 Thread Jakov Smolić
commit: f367af6e790bbdf80c3ea46067a1182b47d54ca9
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri May  5 06:23:21 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri May  5 06:23:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f367af6e

net-misc/frr: destabilize 8.4.2 for ~x86

Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/frr/frr-8.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/frr/frr-8.4.2.ebuild b/net-misc/frr/frr-8.4.2.ebuild
index 0a6c8770e73a..b0ae3ed58713 100644
--- a/net-misc/frr/frr-8.4.2.ebuild
+++ b/net-misc/frr/frr-8.4.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/frr-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2023-04-04 Thread Jakov Smolić
commit: d73e4bec2216ced5da63e04932f79f1f5b8468c4
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Apr  4 08:03:36 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Apr  4 08:06:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d73e4bec

net-misc/frr: add 8.5

Bug: https://bugs.gentoo.org/903757
Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/frr/Manifest   |   1 +
 net-misc/frr/frr-8.5.ebuild | 149 
 2 files changed, 150 insertions(+)

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 52fa8bf498c2..ee1284097b5f 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1 +1,2 @@
 DIST frr-8.4.2.tar.gz 9893223 BLAKE2B 
670fb131c2959b0ce4f3133ef38caeb7832275844b16f8582a693033f5466ad0eb98ab45ed9615e0a121ab80bf034edafe7ee816c47d767bd8a13b52f3138eac
 SHA512 
1ee9d17ef3b85c5c10df624a6560bcacb2b5daa3d6231e457f06d9eb6e5ccf375064a46e809d851c23cb6daf7a4299d1f25be589992ef729e80f9bad41a8d7f7
+DIST frr-8.5.tar.gz 10068379 BLAKE2B 
ed7aa538997bdbfde0370f36a8980ad3ae882a2325cdc7c3b2bdba9d6a43cd9ca04ff96b94b7827e06593a15c104cdadbd2632e136eb2d68e7ed87095a9294a4
 SHA512 
13e2ea8642fc00b565e9a36d2d59abe5d0e11caf646199cd928184fda2de004bda9892ae8a2f91870d5ac218bb127725663b693e4d764e5b21c942bb20b8d66f

diff --git a/net-misc/frr/frr-8.5.ebuild b/net-misc/frr/frr-8.5.ebuild
new file mode 100644
index ..dedac1e7cf84
--- /dev/null
+++ b/net-misc/frr/frr-8.5.ebuild
@@ -0,0 +1,149 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..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 

[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2023-04-03 Thread Jakov Smolić
commit: fa6b744234f1106700be269926cb1652016ced74
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Apr  3 07:33:08 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Apr  3 07:33:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa6b7442

net-misc/frr: drop 8.4.1

Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/frr/Manifest |   1 -
 net-misc/frr/frr-8.4.1.ebuild | 149 --
 2 files changed, 150 deletions(-)

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 8a218a181e80..52fa8bf498c2 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,2 +1 @@
-DIST frr-8.4.1.tar.gz 9886182 BLAKE2B 
be270f34e9ffdbf87a10c7bbd73e9f244128821f1c014060880015e4e7e06165dbc1dc3253894bda5dc1a0607a5bdbad21a70532e9019f1e06d0abd24be1
 SHA512 
69f936580d2e7838e1f15fdfa71a4fa00e7acaa93df4cdbd6129560fbcd45f3754cf5d03b4c9331bf4850477560d63d5509d185098583d19fa93d9e960e1483a
 DIST frr-8.4.2.tar.gz 9893223 BLAKE2B 
670fb131c2959b0ce4f3133ef38caeb7832275844b16f8582a693033f5466ad0eb98ab45ed9615e0a121ab80bf034edafe7ee816c47d767bd8a13b52f3138eac
 SHA512 
1ee9d17ef3b85c5c10df624a6560bcacb2b5daa3d6231e457f06d9eb6e5ccf375064a46e809d851c23cb6daf7a4299d1f25be589992ef729e80f9bad41a8d7f7

diff --git a/net-misc/frr/frr-8.4.1.ebuild b/net-misc/frr/frr-8.4.1.ebuild
deleted file mode 100644
index 1edebad2d2fe..
--- a/net-misc/frr/frr-8.4.1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..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
-
-   # 

[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2023-03-29 Thread Sam James
commit: 76caec64532581b0d1b9c6e09667cd41d616dd36
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 29 14:36:17 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 29 14:36:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76caec64

net-misc/frr: Stabilize 8.4.2 amd64, #903535

Signed-off-by: Sam James  gentoo.org>

 net-misc/frr/frr-8.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/frr/frr-8.4.2.ebuild b/net-misc/frr/frr-8.4.2.ebuild
index cc3e132fc95d..0a6c8770e73a 100644
--- a/net-misc/frr/frr-8.4.2.ebuild
+++ b/net-misc/frr/frr-8.4.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/frr-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2023-03-29 Thread Sam James
commit: 1335beff5950e393c69c6df57b10ec80626f1bc5
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 29 14:36:14 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 29 14:36:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1335beff

net-misc/frr: Stabilize 8.4.2 x86, #903535

Signed-off-by: Sam James  gentoo.org>

 net-misc/frr/frr-8.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/frr/frr-8.4.2.ebuild b/net-misc/frr/frr-8.4.2.ebuild
index ada6b8925460..cc3e132fc95d 100644
--- a/net-misc/frr/frr-8.4.2.ebuild
+++ b/net-misc/frr/frr-8.4.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/frr-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2023-03-14 Thread Sergey Popov
commit: afe08fbc90bba1305225880333cdae02db4d644d
Author: Sergey Popov  gentoo  org>
AuthorDate: Tue Mar 14 08:00:48 2023 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Tue Mar 14 08:00:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afe08fbc

net-misc/frr: drop old version

Signed-off-by: Sergey Popov  gentoo.org>

 net-misc/frr/Manifest |   1 -
 net-misc/frr/frr-8.2.2.ebuild | 148 --
 2 files changed, 149 deletions(-)

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index a5196539cb67..8a218a181e80 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,3 +1,2 @@
-DIST frr-8.2.2.tar.gz 9439460 BLAKE2B 
7ea4b44e3d167677e087ac8767c470b91c485e52f9e45513fb6da8498ff3c56e84dd90257eff3b0067c061e7596578968017cbec7de7ea951b6f80134332e1bf
 SHA512 
52d8e82979823f61ec6f117db1eb41b23fd8ad3197ae3f9d2cfa3ad9d96636a3d2f0b36720b2041a9261c8b639ddd48e46a2351ce41cb596f7dc432cddf29256
 DIST frr-8.4.1.tar.gz 9886182 BLAKE2B 
be270f34e9ffdbf87a10c7bbd73e9f244128821f1c014060880015e4e7e06165dbc1dc3253894bda5dc1a0607a5bdbad21a70532e9019f1e06d0abd24be1
 SHA512 
69f936580d2e7838e1f15fdfa71a4fa00e7acaa93df4cdbd6129560fbcd45f3754cf5d03b4c9331bf4850477560d63d5509d185098583d19fa93d9e960e1483a
 DIST frr-8.4.2.tar.gz 9893223 BLAKE2B 
670fb131c2959b0ce4f3133ef38caeb7832275844b16f8582a693033f5466ad0eb98ab45ed9615e0a121ab80bf034edafe7ee816c47d767bd8a13b52f3138eac
 SHA512 
1ee9d17ef3b85c5c10df624a6560bcacb2b5daa3d6231e457f06d9eb6e5ccf375064a46e809d851c23cb6daf7a4299d1f25be589992ef729e80f9bad41a8d7f7

diff --git a/net-misc/frr/frr-8.2.2.ebuild b/net-misc/frr/frr-8.2.2.ebuild
deleted file mode 100644
index d080ee903222..
--- a/net-misc/frr/frr-8.2.2.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-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
-)
-
-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 

[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2023-02-09 Thread Sergey Popov
commit: 1a898969a376675f0de48f00f314ec8dd7e8ae48
Author: Sergey Popov  gentoo  org>
AuthorDate: Thu Feb  9 17:45:54 2023 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Thu Feb  9 17:47:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a898969

net-misc/frr-8.4.1: stable on amd64/x86

Closes: https://bugs.gentoo.org/890224
Signed-off-by: Sergey Popov  gentoo.org>

 net-misc/frr/frr-8.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/frr/frr-8.4.1.ebuild b/net-misc/frr/frr-8.4.1.ebuild
index dedac1e7cf84..1edebad2d2fe 100644
--- a/net-misc/frr/frr-8.4.1.ebuild
+++ b/net-misc/frr/frr-8.4.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/frr-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/, net-misc/frr/files/

2023-02-04 Thread Sam James
commit: a63f52d8e55b4c5b09f12283fdcae927a2e4f970
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb  4 23:36:31 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb  4 23:36:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a63f52d8

net-misc/frr: add 8.4.2

Closes: https://bugs.gentoo.org/862558
Signed-off-by: Sam James  gentoo.org>

 net-misc/frr/Manifest |   1 +
 net-misc/frr/files/frr-8.4.2-musl-gcc12.patch |  21 
 net-misc/frr/frr-8.4.2.ebuild | 150 ++
 3 files changed, 172 insertions(+)

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index b6c8e2f882e7..a5196539cb67 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,2 +1,3 @@
 DIST frr-8.2.2.tar.gz 9439460 BLAKE2B 
7ea4b44e3d167677e087ac8767c470b91c485e52f9e45513fb6da8498ff3c56e84dd90257eff3b0067c061e7596578968017cbec7de7ea951b6f80134332e1bf
 SHA512 
52d8e82979823f61ec6f117db1eb41b23fd8ad3197ae3f9d2cfa3ad9d96636a3d2f0b36720b2041a9261c8b639ddd48e46a2351ce41cb596f7dc432cddf29256
 DIST frr-8.4.1.tar.gz 9886182 BLAKE2B 
be270f34e9ffdbf87a10c7bbd73e9f244128821f1c014060880015e4e7e06165dbc1dc3253894bda5dc1a0607a5bdbad21a70532e9019f1e06d0abd24be1
 SHA512 
69f936580d2e7838e1f15fdfa71a4fa00e7acaa93df4cdbd6129560fbcd45f3754cf5d03b4c9331bf4850477560d63d5509d185098583d19fa93d9e960e1483a
+DIST frr-8.4.2.tar.gz 9893223 BLAKE2B 
670fb131c2959b0ce4f3133ef38caeb7832275844b16f8582a693033f5466ad0eb98ab45ed9615e0a121ab80bf034edafe7ee816c47d767bd8a13b52f3138eac
 SHA512 
1ee9d17ef3b85c5c10df624a6560bcacb2b5daa3d6231e457f06d9eb6e5ccf375064a46e809d851c23cb6daf7a4299d1f25be589992ef729e80f9bad41a8d7f7

diff --git a/net-misc/frr/files/frr-8.4.2-musl-gcc12.patch 
b/net-misc/frr/files/frr-8.4.2-musl-gcc12.patch
new file mode 100644
index ..3c9374aefd6d
--- /dev/null
+++ b/net-misc/frr/files/frr-8.4.2-musl-gcc12.patch
@@ -0,0 +1,21 @@
+https://github.com/FRRouting/frr/pull/12741
+
+From def86a45a473a45bf8ac39ac4b82be3d09ae9cae Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Sat, 4 Feb 2023 23:29:59 +
+Subject: [PATCH] pceplib: add  include for time_t
+
+Fixes build on musl. Used for time_t in the header.
+
+Bug: https://bugs.gentoo.org/862558
+--- a/pceplib/pcep_utils_counters.h
 b/pceplib/pcep_utils_counters.h
+@@ -30,6 +30,7 @@
+ 
+ #include 
+ #include 
++#include 
+ 
+ #ifdef __cplusplus
+ extern "C" {
+

diff --git a/net-misc/frr/frr-8.4.2.ebuild b/net-misc/frr/frr-8.4.2.ebuild
new file mode 100644
index ..ada6b8925460
--- /dev/null
+++ b/net-misc/frr/frr-8.4.2.ebuild
@@ -0,0 +1,150 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..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
+   "${FILESDIR}"/${PN}-8.4.2-musl-gcc12.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
+   

[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2022-12-08 Thread Sergey Popov
commit: 769c5975ef62b57577c7538f66781e7768b7b048
Author: Sergey Popov  gentoo  org>
AuthorDate: Thu Dec  8 13:15:31 2022 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Thu Dec  8 13:15:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=769c5975

net-misc/frr-8.4.1: correct dependency on net-libs/rtrlib

Signed-off-by: Sergey Popov  gentoo.org>

 net-misc/frr/frr-8.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/frr/frr-8.4.1.ebuild b/net-misc/frr/frr-8.4.1.ebuild
index 3fdcec518b69..f43d14c1e5f7 100644
--- a/net-misc/frr/frr-8.4.1.ebuild
+++ b/net-misc/frr/frr-8.4.1.ebuild
@@ -30,7 +30,7 @@ COMMON_DEPEND="
grpc? ( net-libs/grpc:= )
nhrp? ( net-dns/c-ares:0= )
pam? ( sys-libs/pam )
-   rpki? ( >=net-libs/rtrlib-0.6.3[ssh] )
+   rpki? ( >=net-libs/rtrlib-0.8.0[ssh] )
snmp? ( net-analyzer/net-snmp:= )
 "
 BDEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/, net-misc/frr/files/

2022-12-08 Thread Sergey Popov
commit: c4abe3f5f7c4ecc3aaaee6b35d6f33d245b35175
Author: Sergey Popov  gentoo  org>
AuthorDate: Thu Dec  8 13:11:06 2022 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Thu Dec  8 13:11:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4abe3f5

net-misc/frr: version bump

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

 net-misc/frr/Manifest|   1 +
 net-misc/frr/files/frr-8.4.1-logrotate.patch | 168 +++
 net-misc/frr/frr-8.4.1.ebuild| 149 
 3 files changed, 318 insertions(+)

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 
be270f34e9ffdbf87a10c7bbd73e9f244128821f1c014060880015e4e7e06165dbc1dc3253894bda5dc1a0607a5bdbad21a70532e9019f1e06d0abd24be1
 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 ..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.0 +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 ..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 

[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2022-10-17 Thread Sam James
commit: 03528a8a3c3c88c91bdcbb6dd1fac1f44bd172a6
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 18 00:00:34 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 18 00:00:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03528a8a

net-misc/frr: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 net-misc/frr/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net-misc/frr/metadata.xml b/net-misc/frr/metadata.xml
index 69bd9b16f701..efe31dfdc825 100644
--- a/net-misc/frr/metadata.xml
+++ b/net-misc/frr/metadata.xml
@@ -17,4 +17,7 @@
Add support for PAM (via 
sys-libs/pam) to the Virtual Terminal Interface Shell (vtysh)
Build OSPFAPI support

+   
+   FRRouting/frr
+   
 



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2022-05-30 Thread Jakov Smolić
commit: c71615140ced953190d74099130a12b476ad8901
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon May 30 13:52:14 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon May 30 13:52:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7161514

net-misc/frr: drop 8.1-r1

Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/frr/Manifest  |   1 -
 net-misc/frr/frr-8.1-r1.ebuild | 148 -
 2 files changed, 149 deletions(-)

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 59368f087ab7..d651c9560cd3 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,2 +1 @@
-DIST frr-8.1.tar.gz 8514995 BLAKE2B 
6b70756909b54af3317b1e97956345206612a471893dcfa4d4a7edaf27ae8d94624b0129eb511bf96ac100cc8c5c5234c2f7031d1692f4a81d5025fe797cfd11
 SHA512 
dcbee55b48e9d4aba005a455f8c89e63a86d63a230e6bf2e1f691adf99654e0e170efaf2c8759e0bfc33b977659a828bed248370722210e98a6e2abad8f502aa
 DIST frr-8.2.2.tar.gz 9439460 BLAKE2B 
7ea4b44e3d167677e087ac8767c470b91c485e52f9e45513fb6da8498ff3c56e84dd90257eff3b0067c061e7596578968017cbec7de7ea951b6f80134332e1bf
 SHA512 
52d8e82979823f61ec6f117db1eb41b23fd8ad3197ae3f9d2cfa3ad9d96636a3d2f0b36720b2041a9261c8b639ddd48e46a2351ce41cb596f7dc432cddf29256

diff --git a/net-misc/frr/frr-8.1-r1.ebuild b/net-misc/frr/frr-8.1-r1.ebuild
deleted file mode 100644
index 930f7303dc8f..
--- a/net-misc/frr/frr-8.1-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-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
-   virtual/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
-)
-
-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 

[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2022-05-30 Thread Agostino Sarubbo
commit: 1f74f0625c3584dc135f60f3421742ab8b0595f0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon May 30 06:57:52 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon May 30 06:57:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f74f062

net-misc/frr: x86 stable wrt bug #847940

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/frr/frr-8.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/frr/frr-8.2.2.ebuild b/net-misc/frr/frr-8.2.2.ebuild
index 2e6212ce72d0..930f7303dc8f 100644
--- a/net-misc/frr/frr-8.2.2.ebuild
+++ b/net-misc/frr/frr-8.2.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/frr-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2022-05-28 Thread Jakov Smolić
commit: c0ac4340d500cd5cffb22d5081a7cd12476bfa31
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat May 28 15:58:50 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat May 28 15:58:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0ac4340

net-misc/frr: Stabilize 8.2.2 amd64, #847940

Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/frr/frr-8.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/frr/frr-8.2.2.ebuild b/net-misc/frr/frr-8.2.2.ebuild
index 44fb6e2685fc..2e6212ce72d0 100644
--- a/net-misc/frr/frr-8.2.2.ebuild
+++ b/net-misc/frr/frr-8.2.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/frr-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2022-04-27 Thread Jakov Smolić
commit: 789ce00e3ebca819ba20083002e448eb2d91f84d
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Apr 27 22:20:50 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Apr 27 22:21:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=789ce00e

net-misc/frr: add 8.2.2

Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/frr/Manifest |   1 +
 net-misc/frr/frr-8.2.2.ebuild | 148 ++
 2 files changed, 149 insertions(+)

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index a767d94c0eba..59368f087ab7 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1 +1,2 @@
 DIST frr-8.1.tar.gz 8514995 BLAKE2B 
6b70756909b54af3317b1e97956345206612a471893dcfa4d4a7edaf27ae8d94624b0129eb511bf96ac100cc8c5c5234c2f7031d1692f4a81d5025fe797cfd11
 SHA512 
dcbee55b48e9d4aba005a455f8c89e63a86d63a230e6bf2e1f691adf99654e0e170efaf2c8759e0bfc33b977659a828bed248370722210e98a6e2abad8f502aa
+DIST frr-8.2.2.tar.gz 9439460 BLAKE2B 
7ea4b44e3d167677e087ac8767c470b91c485e52f9e45513fb6da8498ff3c56e84dd90257eff3b0067c061e7596578968017cbec7de7ea951b6f80134332e1bf
 SHA512 
52d8e82979823f61ec6f117db1eb41b23fd8ad3197ae3f9d2cfa3ad9d96636a3d2f0b36720b2041a9261c8b639ddd48e46a2351ce41cb596f7dc432cddf29256

diff --git a/net-misc/frr/frr-8.2.2.ebuild b/net-misc/frr/frr-8.2.2.ebuild
new file mode 100644
index ..44fb6e2685fc
--- /dev/null
+++ b/net-misc/frr/frr-8.2.2.ebuild
@@ -0,0 +1,148 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+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
+   virtual/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
+)
+
+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 

[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2022-02-02 Thread Sergey Popov
commit: dae07e25e41354f3c52f445af3053e5bfa6252db
Author: Sergey Popov  gentoo  org>
AuthorDate: Wed Feb  2 09:34:42 2022 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Wed Feb  2 09:35:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dae07e25

net-misc/frr: fix building with musl

Bug: https://bugs.gentoo.org/832549
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Sergey Popov  gentoo.org>

 net-misc/frr/frr-8.1-r1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-misc/frr/frr-8.1-r1.ebuild b/net-misc/frr/frr-8.1-r1.ebuild
index 07f5fe16b909..930f7303dc8f 100644
--- a/net-misc/frr/frr-8.1-r1.ebuild
+++ b/net-misc/frr/frr-8.1-r1.ebuild
@@ -41,6 +41,7 @@ BDEPEND="
 "
 DEPEND="
${COMMON_DEPEND}
+   elibc_musl? ( sys-libs/queue-standalone )
test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') )
 "
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2022-01-04 Thread David Seifert
commit: 96a37db2e339fd97d57382e3871515fa62496570
Author: David Seifert  gentoo  org>
AuthorDate: Tue Jan  4 10:29:45 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Jan  4 10:29:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96a37db2

net-misc/frr: remove implicit kernel_linux

Signed-off-by: David Seifert  gentoo.org>

 net-misc/frr/frr-8.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/frr/frr-8.1-r1.ebuild b/net-misc/frr/frr-8.1-r1.ebuild
index 2e4b5ede225c..07f5fe16b909 100644
--- a/net-misc/frr/frr-8.1-r1.ebuild
+++ b/net-misc/frr/frr-8.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ S="${WORKDIR}/frr-${P}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp test"
+IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2021-12-12 Thread Jakov Smolić
commit: 18808ee8ed9fa6242c64875efb41656ea58f10c2
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun Dec 12 17:59:34 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Dec 12 17:59:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18808ee8

net-misc/frr: drop 8.0.1

Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/frr/Manifest |   1 -
 net-misc/frr/frr-8.0.1.ebuild | 149 --
 2 files changed, 150 deletions(-)

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 85e2cbf0397a..a767d94c0eba 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,2 +1 @@
-DIST frr-8.0.1.tar.gz 8206852 BLAKE2B 
ed23f62457877fb3173977e1b7092c808adc5d5bd9b1d83747ac42573117adc38865abd1e722073532800f543978e5d67ba7c88416a4335c72bd6b8a3045ff5a
 SHA512 
d9a9ee3b40bf0271779765447c67da817551b5bf2d5d1e9f8073fb4596c622e013fbf7316ca39087db7b7f478b18d07f1fd06f1778abde2734c83112573d5f8f
 DIST frr-8.1.tar.gz 8514995 BLAKE2B 
6b70756909b54af3317b1e97956345206612a471893dcfa4d4a7edaf27ae8d94624b0129eb511bf96ac100cc8c5c5234c2f7031d1692f4a81d5025fe797cfd11
 SHA512 
dcbee55b48e9d4aba005a455f8c89e63a86d63a230e6bf2e1f691adf99654e0e170efaf2c8759e0bfc33b977659a828bed248370722210e98a6e2abad8f502aa

diff --git a/net-misc/frr/frr-8.0.1.ebuild b/net-misc/frr/frr-8.0.1.ebuild
deleted file mode 100644
index 75fd3b38166f..
--- a/net-misc/frr/frr-8.0.1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-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 kernel_linux nhrp ospfapi pam rpki snmp systemd 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
-   virtual/yacc
-   doc? ( dev-python/sphinx )
-"
-DEPEND="
-   ${COMMON_DEPEND}
-   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
-)
-
-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-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples
-   --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)
-   $(use_enable systemd)
-   )
-
-   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 

[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2021-12-12 Thread Jakov Smolić
commit: 62f2d95fe8b53cd2ab3290eb96ab3cff056202f6
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun Dec 12 17:58:34 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Dec 12 17:58:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62f2d95f

net-misc/frr: Stabilize 8.1-r1 x86, #829007

Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/frr/frr-8.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/frr/frr-8.1-r1.ebuild b/net-misc/frr/frr-8.1-r1.ebuild
index 1fcbac9b2687..e462f7c1b081 100644
--- a/net-misc/frr/frr-8.1-r1.ebuild
+++ b/net-misc/frr/frr-8.1-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/frr-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2021-12-12 Thread Jakov Smolić
commit: 064e05da2ed1c2d25fa1488d100e817a5fdfc81c
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun Dec 12 17:58:46 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Dec 12 17:58:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=064e05da

net-misc/frr: Stabilize 8.1-r1 amd64, #829007

Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/frr/frr-8.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/frr/frr-8.1-r1.ebuild b/net-misc/frr/frr-8.1-r1.ebuild
index e462f7c1b081..2e4b5ede225c 100644
--- a/net-misc/frr/frr-8.1-r1.ebuild
+++ b/net-misc/frr/frr-8.1-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/frr-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2021-11-11 Thread Jakov Smolić
commit: d1cc7da4b25b56cc5181dd632d2987cc23f73863
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Nov 11 15:07:57 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Nov 11 15:13:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1cc7da4

net-misc/frr: Update configure options

- upstream commit 2ee5fdba022c6fa78ac6ef6af2577f7dfad2ac02 removed
  `--enable-exampledir` option along with the config example
- commit ab140d61cdd04db03ef597f645e601429396d3c8 removed the systemd
  configure option as support for systemd is enabled through built-in
  function in FRR without depending on libsystemd

Closes: https://bugs.gentoo.org/823083
Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/frr/{frr-8.1.ebuild => frr-8.1-r1.ebuild} | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/net-misc/frr/frr-8.1.ebuild b/net-misc/frr/frr-8.1-r1.ebuild
similarity index 97%
rename from net-misc/frr/frr-8.1.ebuild
rename to net-misc/frr/frr-8.1-r1.ebuild
index 2f581241e3e..1fcbac9b268 100644
--- a/net-misc/frr/frr-8.1.ebuild
+++ b/net-misc/frr/frr-8.1-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/frr-${P}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd test"
+IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
@@ -74,7 +74,6 @@ src_configure() {
--localstatedir="${EPREFIX}"/run/frr
--with-moduledir="${EPREFIX}"/usr/lib/frr/modules
--with-clippy="${BROOT}"/usr/bin/clippy
-   --enable-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples
--enable-user=frr
--enable-group=frr
--enable-vty-group=frr
@@ -90,7 +89,6 @@ src_configure() {
$(usex ospfapi '--enable-ospfclient' '' '' '')
$(use_enable rpki)
$(use_enable snmp)
-   $(use_enable systemd)
)
 
econf "${myconf[@]}"



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2021-11-11 Thread Jakov Smolić
commit: bd1ef183ef98cdbbe1d848c91ab82d831a01aca5
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Nov 11 10:47:37 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Nov 11 10:56:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd1ef183

net-misc/frr: add 8.1

Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/frr/Manifest   |   1 +
 net-misc/frr/frr-8.1.ebuild | 149 
 2 files changed, 150 insertions(+)

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index e9a0e78de4d..85e2cbf0397 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1 +1,2 @@
 DIST frr-8.0.1.tar.gz 8206852 BLAKE2B 
ed23f62457877fb3173977e1b7092c808adc5d5bd9b1d83747ac42573117adc38865abd1e722073532800f543978e5d67ba7c88416a4335c72bd6b8a3045ff5a
 SHA512 
d9a9ee3b40bf0271779765447c67da817551b5bf2d5d1e9f8073fb4596c622e013fbf7316ca39087db7b7f478b18d07f1fd06f1778abde2734c83112573d5f8f
+DIST frr-8.1.tar.gz 8514995 BLAKE2B 
6b70756909b54af3317b1e97956345206612a471893dcfa4d4a7edaf27ae8d94624b0129eb511bf96ac100cc8c5c5234c2f7031d1692f4a81d5025fe797cfd11
 SHA512 
dcbee55b48e9d4aba005a455f8c89e63a86d63a230e6bf2e1f691adf99654e0e170efaf2c8759e0bfc33b977659a828bed248370722210e98a6e2abad8f502aa

diff --git a/net-misc/frr/frr-8.1.ebuild b/net-misc/frr/frr-8.1.ebuild
new file mode 100644
index 000..2f581241e3e
--- /dev/null
+++ b/net-misc/frr/frr-8.1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 kernel_linux nhrp ospfapi pam rpki snmp systemd 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
+   virtual/yacc
+   doc? ( dev-python/sphinx )
+"
+DEPEND="
+   ${COMMON_DEPEND}
+   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
+)
+
+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-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples
+   --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)
+   $(use_enable systemd)
+   )
+
+   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
+
+ 

[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/files/

2021-11-01 Thread Sergey Popov
commit: a18bd023e25cf04c27cfda5f850881eaf2756115
Author: Sergey Popov  gentoo  org>
AuthorDate: Mon Nov  1 17:22:03 2021 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Mon Nov  1 17:22:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18bd023

net-misc/frr: fix multi-instance protocols configuration handling

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergey Popov  gentoo.org>

 net-misc/frr/files/frr-openrc-v1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-misc/frr/files/frr-openrc-v1 b/net-misc/frr/files/frr-openrc-v1
index 9e2f1ab914f..3f9da62e2a1 100644
--- a/net-misc/frr/files/frr-openrc-v1
+++ b/net-misc/frr/files/frr-openrc-v1
@@ -92,6 +92,7 @@ _load_daemon_list() {
 for instance in $(echo $cdaemon_instances | tr ',' ' '); do
   watchfrr_daemons="$watchfrr_daemons $daemon-$instance"
 done
+   continue
   fi
 
   # Single instance daemon handling.



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2021-10-14 Thread Sergey Popov
commit: 81d5fddf362805289c12c5e851f9e8ac50548ebd
Author: Sergey Popov  gentoo  org>
AuthorDate: Thu Oct 14 13:38:11 2021 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Thu Oct 14 13:38:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81d5fddf

net-misc/frr-8.0.1: stable on amd64 and x86

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergey Popov  gentoo.org>

 net-misc/frr/frr-8.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/frr/frr-8.0.1.ebuild b/net-misc/frr/frr-8.0.1.ebuild
index 2f581241e3e..75fd3b38166 100644
--- a/net-misc/frr/frr-8.0.1.ebuild
+++ b/net-misc/frr/frr-8.0.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/frr-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/, net-misc/frr/files/

2021-09-12 Thread Jakov Smolić
commit: 3c699095ef5426ffe636269bd259c6aa63d02b70
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun Sep 12 08:02:53 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Sep 12 08:04:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c699095

net-misc/frr: Remove old 8.0

Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/frr/Manifest   |   1 -
 net-misc/frr/files/frr-8.0-c-ares.patch |  19 
 net-misc/frr/frr-8.0.ebuild | 150 
 3 files changed, 170 deletions(-)

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 0d77ca8d5aa..e9a0e78de4d 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,2 +1 @@
 DIST frr-8.0.1.tar.gz 8206852 BLAKE2B 
ed23f62457877fb3173977e1b7092c808adc5d5bd9b1d83747ac42573117adc38865abd1e722073532800f543978e5d67ba7c88416a4335c72bd6b8a3045ff5a
 SHA512 
d9a9ee3b40bf0271779765447c67da817551b5bf2d5d1e9f8073fb4596c622e013fbf7316ca39087db7b7f478b18d07f1fd06f1778abde2734c83112573d5f8f
-DIST frr-8.0.tar.gz 8195258 BLAKE2B 
75d8d4410a5377dae3bf6938c3b095b163ad87776420a16c07d461bb3f635d623de642fa0ae483094788369c9dc6a04d5424107bf60c848ac54756c4bdb20c97
 SHA512 
fdf1e68c16e266a74221fb194851ef47c888e90324de2e42a4ca68b9dbce1ba6f45d73b9830bdb17774ecdde736111fa562201a5763c49092b6ce1f0a4d4865a

diff --git a/net-misc/frr/files/frr-8.0-c-ares.patch 
b/net-misc/frr/files/frr-8.0-c-ares.patch
deleted file mode 100644
index c313006e863..000
--- a/net-misc/frr/files/frr-8.0-c-ares.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bugs.gentoo.org/809728
 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
deleted file mode 100644
index 6343f0f45e3..000
--- a/net-misc/frr/frr-8.0.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-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 kernel_linux nhrp ospfapi pam rpki snmp systemd 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
-   virtual/yacc
-   doc? ( dev-python/sphinx )
-"
-DEPEND="
-   ${COMMON_DEPEND}
-   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}"/${P}-c-ares.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-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples
-   --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)
- 

[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2021-08-31 Thread Jakov Smolić
commit: 8cf2f39ea7be8df6e6d96c35fff5c2c9da0feac3
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Aug 31 15:30:04 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Aug 31 15:30:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cf2f39e

net-misc/frr: Remove old 7.5.1

Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/frr/Manifest|   1 -
 net-misc/frr/frr-7.5.1-r4.ebuild | 147 ---
 2 files changed, 148 deletions(-)

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 543eebebd45..0d77ca8d5aa 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,3 +1,2 @@
-DIST frr-7.5.1.tar.gz 6746148 BLAKE2B 
e6a8d38bac1323852d933ca9eaac681df8824407af008bb0170937a01564b3fb9fb081418630b7540f3ccdb899ac0948121d63accfa65ae0fd3fd6933fdafd6d
 SHA512 
cf20316abd39a2d96bb377bd594464ae74c20ad70c60246409fe9f04f0177fcd8891a8da54d83bee962f589a00e71f7b51e78f9729c8680e6265ddd548e0464e
 DIST frr-8.0.1.tar.gz 8206852 BLAKE2B 
ed23f62457877fb3173977e1b7092c808adc5d5bd9b1d83747ac42573117adc38865abd1e722073532800f543978e5d67ba7c88416a4335c72bd6b8a3045ff5a
 SHA512 
d9a9ee3b40bf0271779765447c67da817551b5bf2d5d1e9f8073fb4596c622e013fbf7316ca39087db7b7f478b18d07f1fd06f1778abde2734c83112573d5f8f
 DIST frr-8.0.tar.gz 8195258 BLAKE2B 
75d8d4410a5377dae3bf6938c3b095b163ad87776420a16c07d461bb3f635d623de642fa0ae483094788369c9dc6a04d5424107bf60c848ac54756c4bdb20c97
 SHA512 
fdf1e68c16e266a74221fb194851ef47c888e90324de2e42a4ca68b9dbce1ba6f45d73b9830bdb17774ecdde736111fa562201a5763c49092b6ce1f0a4d4865a

diff --git a/net-misc/frr/frr-7.5.1-r4.ebuild b/net-misc/frr/frr-7.5.1-r4.ebuild
deleted file mode 100644
index 4731885ece1..000
--- a/net-misc/frr/frr-7.5.1-r4.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-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 kernel_linux nhrp ospfapi pam rpki snmp systemd test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-   ${PYTHON_DEPS}
-   acct-user/frr
-   dev-libs/json-c:0=
-   >=net-libs/libyang-1.0.184
-   =net-libs/rtrlib-0.6.3[ssh] )
-   snmp? ( net-analyzer/net-snmp:= )"
-
-BDEPEND="
-   dev-util/clippy
-   sys-devel/flex
-   virtual/yacc
-   doc? ( dev-python/sphinx )"
-
-DEPEND="
-   ${COMMON_DEPEND}
-   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 )
-
-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-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples
-   --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)
-   $(use_enable systemd)
-   )
-
-   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 

[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2021-08-28 Thread Jakov Smolić
commit: 718df6bcd46aff59f597c3e20d6cf841de79833b
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Aug 28 09:00:43 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Aug 28 09:00:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=718df6bc

net-misc/frr: Version bump to 8.0.1

Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/frr/Manifest |   1 +
 net-misc/frr/frr-8.0.1.ebuild | 149 ++
 2 files changed, 150 insertions(+)

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 4d5d97d69a7..543eebebd45 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,2 +1,3 @@
 DIST frr-7.5.1.tar.gz 6746148 BLAKE2B 
e6a8d38bac1323852d933ca9eaac681df8824407af008bb0170937a01564b3fb9fb081418630b7540f3ccdb899ac0948121d63accfa65ae0fd3fd6933fdafd6d
 SHA512 
cf20316abd39a2d96bb377bd594464ae74c20ad70c60246409fe9f04f0177fcd8891a8da54d83bee962f589a00e71f7b51e78f9729c8680e6265ddd548e0464e
+DIST frr-8.0.1.tar.gz 8206852 BLAKE2B 
ed23f62457877fb3173977e1b7092c808adc5d5bd9b1d83747ac42573117adc38865abd1e722073532800f543978e5d67ba7c88416a4335c72bd6b8a3045ff5a
 SHA512 
d9a9ee3b40bf0271779765447c67da817551b5bf2d5d1e9f8073fb4596c622e013fbf7316ca39087db7b7f478b18d07f1fd06f1778abde2734c83112573d5f8f
 DIST frr-8.0.tar.gz 8195258 BLAKE2B 
75d8d4410a5377dae3bf6938c3b095b163ad87776420a16c07d461bb3f635d623de642fa0ae483094788369c9dc6a04d5424107bf60c848ac54756c4bdb20c97
 SHA512 
fdf1e68c16e266a74221fb194851ef47c888e90324de2e42a4ca68b9dbce1ba6f45d73b9830bdb17774ecdde736111fa562201a5763c49092b6ce1f0a4d4865a

diff --git a/net-misc/frr/frr-8.0.1.ebuild b/net-misc/frr/frr-8.0.1.ebuild
new file mode 100644
index 000..2f581241e3e
--- /dev/null
+++ b/net-misc/frr/frr-8.0.1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 kernel_linux nhrp ospfapi pam rpki snmp systemd 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
+   virtual/yacc
+   doc? ( dev-python/sphinx )
+"
+DEPEND="
+   ${COMMON_DEPEND}
+   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
+)
+
+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-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples
+   --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)
+   $(use_enable systemd)
+   )
+
+   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 

[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/files/, net-misc/frr/

2021-08-25 Thread Sergey Popov
commit: 295a86b2494085c4125761afddc962d6a66ebc09
Author: Jakov Smolic  sartura  hr>
AuthorDate: Mon Aug 23 21:26:26 2021 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Wed Aug 25 07:35:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=295a86b2

net-misc/frr: Fix broken c-ares detection

Closes: https://github.com/gentoo/gentoo/pull/22085
Closes: https://bugs.gentoo.org/809728
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: Sergey Popov  gentoo.org>

 net-misc/frr/files/frr-8.0-c-ares.patch | 19 +++
 net-misc/frr/frr-8.0.ebuild |  5 -
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/net-misc/frr/files/frr-8.0-c-ares.patch 
b/net-misc/frr/files/frr-8.0-c-ares.patch
new file mode 100644
index 000..c313006e863
--- /dev/null
+++ b/net-misc/frr/files/frr-8.0-c-ares.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/809728
+--- 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 57ef54e4692..6343f0f45e3 100644
--- a/net-misc/frr/frr-8.0.ebuild
+++ b/net-misc/frr/frr-8.0.ebuild
@@ -49,7 +49,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.patch
+)
 
 src_prepare() {
default



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2021-08-24 Thread Sergey Popov
commit: 396b68cce6eb720f5d8f1e08599fd0e1cedc4ea6
Author: Sergey Popov  gentoo  org>
AuthorDate: Tue Aug 24 07:23:38 2021 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Tue Aug 24 07:23:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=396b68cc

net-misc/frr: fix dependency on dev-util/clippy

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergey Popov  gentoo.org>

 net-misc/frr/frr-8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/frr/frr-8.0.ebuild b/net-misc/frr/frr-8.0.ebuild
index 09bbffa7a3c..57ef54e4692 100644
--- a/net-misc/frr/frr-8.0.ebuild
+++ b/net-misc/frr/frr-8.0.ebuild
@@ -34,7 +34,7 @@ COMMON_DEPEND="
snmp? ( net-analyzer/net-snmp:= )
 "
 BDEPEND="
-   dev-util/clippy
+   >=dev-util/clippy-${PV}
sys-devel/flex
virtual/yacc
doc? ( dev-python/sphinx )



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2021-08-22 Thread David Seifert
commit: 0ae7306f468ae0443f2b03c4a594913af3d0e32f
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sun Aug 22 21:53:42 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Aug 22 21:53:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ae7306f

net-misc/frr: Version bump to 8.0

Closes: https://github.com/gentoo/gentoo/pull/22063
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 net-misc/frr/Manifest   |   1 +
 net-misc/frr/frr-8.0.ebuild | 147 
 2 files changed, 148 insertions(+)

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 0edab74ae8d..4d5d97d69a7 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1 +1,2 @@
 DIST frr-7.5.1.tar.gz 6746148 BLAKE2B 
e6a8d38bac1323852d933ca9eaac681df8824407af008bb0170937a01564b3fb9fb081418630b7540f3ccdb899ac0948121d63accfa65ae0fd3fd6933fdafd6d
 SHA512 
cf20316abd39a2d96bb377bd594464ae74c20ad70c60246409fe9f04f0177fcd8891a8da54d83bee962f589a00e71f7b51e78f9729c8680e6265ddd548e0464e
+DIST frr-8.0.tar.gz 8195258 BLAKE2B 
75d8d4410a5377dae3bf6938c3b095b163ad87776420a16c07d461bb3f635d623de642fa0ae483094788369c9dc6a04d5424107bf60c848ac54756c4bdb20c97
 SHA512 
fdf1e68c16e266a74221fb194851ef47c888e90324de2e42a4ca68b9dbce1ba6f45d73b9830bdb17774ecdde736111fa562201a5763c49092b6ce1f0a4d4865a

diff --git a/net-misc/frr/frr-8.0.ebuild b/net-misc/frr/frr-8.0.ebuild
new file mode 100644
index 000..09bbffa7a3c
--- /dev/null
+++ b/net-misc/frr/frr-8.0.ebuild
@@ -0,0 +1,147 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 kernel_linux nhrp ospfapi pam rpki snmp systemd 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
+   sys-devel/flex
+   virtual/yacc
+   doc? ( dev-python/sphinx )
+"
+DEPEND="
+   ${COMMON_DEPEND}
+   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 )
+
+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-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples
+   --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)
+   $(use_enable systemd)
+   )
+
+   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
+   

[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2021-05-27 Thread David Seifert
commit: ee2860a07bf850c7553938b022ce19d4f3073775
Author: Jakov Smolic  sartura  hr>
AuthorDate: Thu May 27 21:12:27 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu May 27 21:12:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee2860a0

net-misc/frr: Adjust upper libyang bound

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 net-misc/frr/{frr-7.5.1-r2.ebuild => frr-7.5.1-r3.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-misc/frr/frr-7.5.1-r2.ebuild b/net-misc/frr/frr-7.5.1-r3.ebuild
similarity index 99%
rename from net-misc/frr/frr-7.5.1-r2.ebuild
rename to net-misc/frr/frr-7.5.1-r3.ebuild
index 5b7e3d01473..0a5028d606e 100644
--- a/net-misc/frr/frr-7.5.1-r2.ebuild
+++ b/net-misc/frr/frr-7.5.1-r3.ebuild
@@ -24,6 +24,7 @@ COMMON_DEPEND="
acct-user/frr
dev-libs/json-c:0=
>=net-libs/libyang-1.0.184
+   

[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2021-05-14 Thread Sam James
commit: 3820d22265c15770cf5c885b6bbce2f4e8a8f594
Author: Sam James  gentoo  org>
AuthorDate: Sat May 15 02:21:43 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 15 02:21:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3820d222

net-misc/frr: Keyword 7.5.1-r2 arm64, #766411

Signed-off-by: Sam James  gentoo.org>

 net-misc/frr/frr-7.5.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/frr/frr-7.5.1-r2.ebuild b/net-misc/frr/frr-7.5.1-r2.ebuild
index 9e16c18b16d..5b7e3d01473 100644
--- a/net-misc/frr/frr-7.5.1-r2.ebuild
+++ b/net-misc/frr/frr-7.5.1-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/frr-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2021-03-30 Thread Sam James
commit: e5b933ac1ada8ca7f85964bc3400ca9b70a6cce6
Author: Jakov Smolic  sartura  hr>
AuthorDate: Tue Mar 30 18:15:41 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 30 18:27:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5b933ac

net-misc/frr: Swith to myconf array in src_configure()

Closes: https://bugs.gentoo.org/779376
Signed-off-by: Jakov Smolic  sartura.hr>
Closes: https://github.com/gentoo/gentoo/pull/20202
Signed-off-by: Sam James  gentoo.org>

 net-misc/frr/frr-7.5.1-r2.ebuild | 59 +---
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/net-misc/frr/frr-7.5.1-r2.ebuild b/net-misc/frr/frr-7.5.1-r2.ebuild
index 3dc03767e32..9e16c18b16d 100644
--- a/net-misc/frr/frr-7.5.1-r2.ebuild
+++ b/net-misc/frr/frr-7.5.1-r2.ebuild
@@ -57,36 +57,39 @@ src_prepare() {
 }
 
 src_configure() {
-   econf \
-   --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 \
+   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-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples \
-   --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) \
+   --enable-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples
+   --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)
$(use_enable systemd)
+   )
+
+   econf "${myconf[@]}"
 }
 
 src_compile() {



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2021-03-30 Thread David Seifert
commit: 2b506d4977bcc8c283a885910a9cb1774abe9fe6
Author: Jakov Smolic  sartura  hr>
AuthorDate: Tue Mar 30 09:29:02 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Mar 30 09:29:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b506d49

net-misc/frr: Support cross-compilation

Closes: https://bugs.gentoo.org/766959
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 net-misc/frr/{frr-7.5.1-r1.ebuild => frr-7.5.1-r2.ebuild} | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net-misc/frr/frr-7.5.1-r1.ebuild b/net-misc/frr/frr-7.5.1-r2.ebuild
similarity index 98%
rename from net-misc/frr/frr-7.5.1-r1.ebuild
rename to net-misc/frr/frr-7.5.1-r2.ebuild
index 899edf8f2bd..3dc03767e32 100644
--- a/net-misc/frr/frr-7.5.1-r1.ebuild
+++ b/net-misc/frr/frr-7.5.1-r2.ebuild
@@ -33,6 +33,7 @@ COMMON_DEPEND="
snmp? ( net-analyzer/net-snmp )"
 
 BDEPEND="
+   dev-util/clippy
sys-devel/flex
virtual/yacc
doc? ( dev-python/sphinx )"
@@ -68,6 +69,7 @@ src_configure() {
--sysconfdir="${EPREFIX}"/etc/frr \
--localstatedir="${EPREFIX}"/run/frr \
--with-moduledir="${EPREFIX}"/usr/lib/frr/modules \
+   --with-clippy="${BROOT}"/usr/bin/clippy
--enable-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples \
--enable-user=frr \
--enable-group=frr \



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2021-03-30 Thread David Seifert
commit: d03387b0f305bf07de71d80e4453c1b1eedc4831
Author: Jakov Smolic  sartura  hr>
AuthorDate: Tue Mar 30 09:29:11 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Mar 30 09:29:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d03387b0

net-misc/frr: Remove old 7.5

Closes: https://github.com/gentoo/gentoo/pull/19201
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 net-misc/frr/Manifest   |   1 -
 net-misc/frr/frr-7.5.ebuild | 150 
 2 files changed, 151 deletions(-)

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 34ad8e3763c..0edab74ae8d 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,2 +1 @@
 DIST frr-7.5.1.tar.gz 6746148 BLAKE2B 
e6a8d38bac1323852d933ca9eaac681df8824407af008bb0170937a01564b3fb9fb081418630b7540f3ccdb899ac0948121d63accfa65ae0fd3fd6933fdafd6d
 SHA512 
cf20316abd39a2d96bb377bd594464ae74c20ad70c60246409fe9f04f0177fcd8891a8da54d83bee962f589a00e71f7b51e78f9729c8680e6265ddd548e0464e
-DIST frr-7.5.tar.gz 6730659 BLAKE2B 
12c915e7564b8f0157b20b0714b1efd8c2ad0c51dbaeb1eb3ef2d5ea50406c297d7f4bd854d9246b515d42f3fa326b2b3c7a30d83f35b64c374947b26709f6fe
 SHA512 
d0d3c0bc0d30e2ebb93e20906768a996d21db23b23118c8e3c50d238e7bfdee7a789b4a90c9d7dbdc842d857f60bd44f0922b01b0c2c8b289ac860f008a430a9

diff --git a/net-misc/frr/frr-7.5.ebuild b/net-misc/frr/frr-7.5.ebuild
deleted file mode 100644
index 425a5994403..000
--- a/net-misc/frr/frr-7.5.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-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;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd test"
-
-COMMON_DEPEND="
-   ${PYTHON_DEPS}
-   acct-user/frr
-   dev-libs/json-c:0=
-   >=net-libs/libyang-1.0.184
-   sys-libs/libcap
-   sys-libs/readline: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 )
-"
-
-BDEPEND="
-   doc? ( dev-python/sphinx )
-   sys-devel/flex
-   virtual/yacc
-"
-
-DEPEND="
-   ${COMMON_DEPEND}
-   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"
-)
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-# FRR tarballs have weird format.
-S="${WORKDIR}/frr-${P}"
-
-src_prepare() {
-   default
-
-   python_fix_shebang tools
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   --disable-static \
-   --with-pkg-extra-version="-gentoo" \
-   --enable-configfile-mask=0640 \
-   --enable-logfile-mask=0640 \
-   --prefix=/usr \
-   --libdir=/usr/lib/frr \
-   --sbindir=/usr/lib/frr \
-   --libexecdir=/usr/lib/frr \
-   --sysconfdir=/etc/frr \
-   --localstatedir=/run/frr \
-   --with-moduledir=/usr/lib/frr/modules \
-   --enable-exampledir=/usr/share/doc/${PF}/samples \
-   --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) \
-   $(use_enable systemd)
-}
-
-src_compile() {
-   default
-
-   use doc && (cd doc; make html)
-}
-
-src_install() {
-   default
-   find "${D}" -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 

[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2021-03-30 Thread David Seifert
commit: 18c4235517849436d6d8062186da0ccd1251691b
Author: Jakov Smolic  sartura  hr>
AuthorDate: Tue Mar 30 09:29:05 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Mar 30 09:29:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18c42355

net-misc/frr: Fix metadata.xml formatting

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 net-misc/frr/metadata.xml | 24 ++--
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/net-misc/frr/metadata.xml b/net-misc/frr/metadata.xml
index 043dceace19..0b854415f3b 100644
--- a/net-misc/frr/metadata.xml
+++ b/net-misc/frr/metadata.xml
@@ -6,23 +6,11 @@
Sergey Popov


-   
-   Enable gRPC plugin
-   
-   
-   Build Next Hop Resolution Protocol daemon
-   
-   
-   Enable Forwarding Plane Manager support
-   
-   
-   Enable RPKI
-   
-   
-   Add support for PAM (via sys-libs/pam) to 
the Virtual Terminal Interface Shell (vtysh);
-   
-   
-   Build OSPFAPI support
-   
+   Enable gRPC plugin
+   Build Next Hop Resolution Protocol 
daemon
+   Enable Forwarding Plane Manager support
+   Enable RPKI
+   Add support for PAM (via 
sys-libs/pam) to the Virtual Terminal Interface Shell (vtysh)
+   Build OSPFAPI support

 



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2021-03-30 Thread David Seifert
commit: a64b55a9b6b696abec328e4a2096219f0fc4a724
Author: Jakov Smolic  sartura  hr>
AuthorDate: Tue Mar 30 09:29:08 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Mar 30 09:29:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a64b55a9

net-misc/frr: Add myself as co-maint

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 net-misc/frr/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/net-misc/frr/metadata.xml b/net-misc/frr/metadata.xml
index 0b854415f3b..dc5cd64d6f4 100644
--- a/net-misc/frr/metadata.xml
+++ b/net-misc/frr/metadata.xml
@@ -5,6 +5,10 @@
pinkb...@gentoo.org
Sergey Popov

+   
+   jakov.smo...@sartura.hr
+   Jakov Smolic
+   

Enable gRPC plugin
Build Next Hop Resolution Protocol 
daemon



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2021-03-26 Thread Sam James
commit: b25dc0b314c399fb65d58d4aa0d537f55f0bbb12
Author: Jakov Smolic  sartura  hr>
AuthorDate: Fri Mar 26 16:02:29 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 26 16:48:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b25dc0b3

net-misc/frr: Fix typos

Closes: https://bugs.gentoo.org/778413
Signed-off-by: Jakov Smolic  sartura.hr>
Closes: https://github.com/gentoo/gentoo/pull/20128
Signed-off-by: Sam James  gentoo.org>

 net-misc/frr/{frr-7.5.1.ebuild => frr-7.5.1-r1.ebuild} | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/net-misc/frr/frr-7.5.1.ebuild b/net-misc/frr/frr-7.5.1-r1.ebuild
similarity index 89%
rename from net-misc/frr/frr-7.5.1.ebuild
rename to net-misc/frr/frr-7.5.1-r1.ebuild
index 9dd4b72908c..899edf8f2bd 100644
--- a/net-misc/frr/frr-7.5.1.ebuild
+++ b/net-misc/frr/frr-7.5.1-r1.ebuild
@@ -61,14 +61,14 @@ src_configure() {
--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 \
-   --enable-exampledir="{EPREFIX}"/usr/share/doc/${PF}/samples \
+   --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 \
+   --enable-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples \
--enable-user=frr \
--enable-group=frr \
--enable-vty-group=frr \



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2021-03-26 Thread David Seifert
commit: 376ba2dbedee69088c4752ef63f31d668b3d35f2
Author: Jakov Smolic  sartura  hr>
AuthorDate: Fri Mar 26 11:37:08 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Mar 26 11:37:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=376ba2db

net-misc/frr: Bump to 7.5.1

Closes: https://github.com/gentoo/gentoo/pull/20102
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 net-misc/frr/Manifest |   1 +
 net-misc/frr/frr-7.5.1.ebuild | 140 ++
 2 files changed, 141 insertions(+)

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 7ae456fb389..34ad8e3763c 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1 +1,2 @@
+DIST frr-7.5.1.tar.gz 6746148 BLAKE2B 
e6a8d38bac1323852d933ca9eaac681df8824407af008bb0170937a01564b3fb9fb081418630b7540f3ccdb899ac0948121d63accfa65ae0fd3fd6933fdafd6d
 SHA512 
cf20316abd39a2d96bb377bd594464ae74c20ad70c60246409fe9f04f0177fcd8891a8da54d83bee962f589a00e71f7b51e78f9729c8680e6265ddd548e0464e
 DIST frr-7.5.tar.gz 6730659 BLAKE2B 
12c915e7564b8f0157b20b0714b1efd8c2ad0c51dbaeb1eb3ef2d5ea50406c297d7f4bd854d9246b515d42f3fa326b2b3c7a30d83f35b64c374947b26709f6fe
 SHA512 
d0d3c0bc0d30e2ebb93e20906768a996d21db23b23118c8e3c50d238e7bfdee7a789b4a90c9d7dbdc842d857f60bd44f0922b01b0c2c8b289ac860f008a430a9

diff --git a/net-misc/frr/frr-7.5.1.ebuild b/net-misc/frr/frr-7.5.1.ebuild
new file mode 100644
index 000..9dd4b72908c
--- /dev/null
+++ b/net-misc/frr/frr-7.5.1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+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 ~x86"
+IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+   ${PYTHON_DEPS}
+   acct-user/frr
+   dev-libs/json-c:0=
+   >=net-libs/libyang-1.0.184
+   sys-libs/libcap
+   sys-libs/readline: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 )"
+
+BDEPEND="
+   sys-devel/flex
+   virtual/yacc
+   doc? ( dev-python/sphinx )"
+
+DEPEND="
+   ${COMMON_DEPEND}
+   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 )
+
+src_prepare() {
+   default
+
+   python_fix_shebang tools
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --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 \
+   --enable-exampledir="{EPREFIX}"/usr/share/doc/${PF}/samples \
+   --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) \
+   $(use_enable systemd)
+}
+
+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 

[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2020-12-05 Thread Sergey Popov
commit: 936f3aef981b99b77e8b1d0c71ad8546f27e8dd4
Author: Sergey Popov  gentoo  org>
AuthorDate: Sat Dec  5 14:50:34 2020 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Sat Dec  5 14:58:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=936f3aef

net-misc/frr: correct dependencies

Add missing dependencies for tests
Fix collision with net-libs/libsmi

Reported-by: Toralf Förster  gentoo.org>
Closes: https://bugs.gentoo.org/758383
Closes: https://bugs.gentoo.org/758389
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sergey Popov  gentoo.org>

 net-misc/frr/frr-7.5.ebuild | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/net-misc/frr/frr-7.5.ebuild b/net-misc/frr/frr-7.5.ebuild
index 1ed14a42b73..425a5994403 100644
--- a/net-misc/frr/frr-7.5.ebuild
+++ b/net-misc/frr/frr-7.5.ebuild
@@ -14,9 +14,10 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd"
+IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd test"
 
 COMMON_DEPEND="
+   ${PYTHON_DEPS}
acct-user/frr
dev-libs/json-c:0=
>=net-libs/libyang-1.0.184
@@ -30,19 +31,18 @@ COMMON_DEPEND="
 "
 
 BDEPEND="
-   ${COMMON_DEPEND}
doc? ( dev-python/sphinx )
sys-devel/flex
virtual/yacc
 "
 
 DEPEND="
-   ${PYTHON_DEPS}
${COMMON_DEPEND}
+   test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') )
 "
 
 RDEPEND="
-   ${DEPEND}
+   ${COMMON_DEPEND}
$(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]')
!!net-misc/quagga
 "
@@ -53,6 +53,8 @@ PATCHES=(
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+RESTRICT="!test? ( test )"
+
 # FRR tarballs have weird format.
 S="${WORKDIR}/frr-${P}"
 
@@ -142,4 +144,7 @@ src_install() {
# Install init scripts
systemd_dounit tools/frr.service
newinitd "${FILESDIR}/frr-openrc-v1" frr
+
+   # Conflict files, installed by net-libs/libsmi, bug #758383
+   rm "${D}/usr/share/yang/ietf-interfaces.yang" || die
 }



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/

2020-12-04 Thread Sergey Popov
commit: 2817911383011d761afa3a9178aafde3e3eb4890
Author: Sergey Popov  gentoo  org>
AuthorDate: Fri Dec  4 11:53:17 2020 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Fri Dec  4 11:53:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28179113

net-misc/frr: add missing REQUIRED_USE for Python dependency

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sergey Popov  gentoo.org>

 net-misc/frr/frr-7.5.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net-misc/frr/frr-7.5.ebuild b/net-misc/frr/frr-7.5.ebuild
index b4a72f6ec31..1ed14a42b73 100644
--- a/net-misc/frr/frr-7.5.ebuild
+++ b/net-misc/frr/frr-7.5.ebuild
@@ -51,6 +51,8 @@ PATCHES=(
"${FILESDIR}/${PN}-7.5-ipctl-forwarding.patch"
 )
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 # FRR tarballs have weird format.
 S="${WORKDIR}/frr-${P}"
 



[gentoo-commits] repo/gentoo:master commit in: net-misc/frr/files/, net-misc/frr/

2020-12-04 Thread Sergey Popov
commit: 6e5281720ed938c39aa169cca856955527937a10
Author: Sergey Popov  gentoo  org>
AuthorDate: Fri Dec  4 09:48:34 2020 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Fri Dec  4 09:48:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e528172

net-misc/frr: new package

The FRRouting Protocol Suite, fork of quagga

Signed-off-by: Sergey Popov  gentoo.org>

 net-misc/frr/Manifest |   1 +
 net-misc/frr/files/frr-7.5-ipctl-forwarding.patch |  22 ++
 net-misc/frr/files/frr-openrc-v1  | 300 ++
 net-misc/frr/files/frr.pam|  26 ++
 net-misc/frr/frr-7.5.ebuild   | 143 +++
 net-misc/frr/metadata.xml |  28 ++
 6 files changed, 520 insertions(+)

diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
new file mode 100644
index 000..7ae456fb389
--- /dev/null
+++ b/net-misc/frr/Manifest
@@ -0,0 +1 @@
+DIST frr-7.5.tar.gz 6730659 BLAKE2B 
12c915e7564b8f0157b20b0714b1efd8c2ad0c51dbaeb1eb3ef2d5ea50406c297d7f4bd854d9246b515d42f3fa326b2b3c7a30d83f35b64c374947b26709f6fe
 SHA512 
d0d3c0bc0d30e2ebb93e20906768a996d21db23b23118c8e3c50d238e7bfdee7a789b4a90c9d7dbdc842d857f60bd44f0922b01b0c2c8b289ac860f008a430a9

diff --git a/net-misc/frr/files/frr-7.5-ipctl-forwarding.patch 
b/net-misc/frr/files/frr-7.5-ipctl-forwarding.patch
new file mode 100644
index 000..f6b726b591f
--- /dev/null
+++ b/net-misc/frr/files/frr-7.5-ipctl-forwarding.patch
@@ -0,0 +1,22 @@
+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.0 -0500
 quagga-0.99.16/zebra/ipforward_sysctl.c2010-03-11 12:11:39.0 
-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-openrc-v1 b/net-misc/frr/files/frr-openrc-v1
new file mode 100644
index 000..9e2f1ab914f
--- /dev/null
+++ b/net-misc/frr/files/frr-openrc-v1
@@ -0,0 +1,300 @@
+#!/sbin/openrc-run
+#
+# FRR OpenRC init script.
+#
+# Copyright (C) 2020 Rafael F. Zalamena
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; only version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+description="FRR initialization script."
+
+# FRR variables.
+frr_dir="/usr/lib/frr"
+frr_state_dir="/run/frr"
+config_file="/etc/frr/frr.conf"
+daemon_file="/etc/frr/daemons"
+daemon_db="/run/frrdb"
+vty_config_file="/etc/frr/vtysh.conf"
+frr_reload="$frr_dir/frr-reload.py"
+frr_reload_log="$frr_state_dir/reload.log"
+
+# Don't change profile here, use $daemon_file. This is the default.
+frr_profile="traditional"
+
+# watchfrr variables.
+watchfrr_daemons=''
+watchfrr_pidfile="$frr_state_dir/watchfrr.pid"
+
+#
+# Helpers.
+#
+_check_daemon_binary() {
+  local daemon=$1
+
+  [ -x "$frr_dir/$daemon" ] && return 0
+
+  eerror "No binary found for $daemon in $frr_dir"
+  return 1
+}
+
+_load_daemon_list() {
+  # Load FRR daemons configuration file.
+  while read line <&3 ; do
+case $line in
+  ""|"#"*)
+# Skip empty/commented lines.
+continue
+;;
+
+  *d=*|*_instances=*|*_options=*|*_wrap=*)
+# Load daemon options.
+eval "$line"
+;;
+
+  MAX_FDS=*|frr_profile=*|vtysh_enable=*)
+# Load misc configuration.
+eval "$line"
+;;
+esac
+  done 3< $daemon_file
+
+  # `zebra` and `staticd` are mandatory.
+  _check_daemon_binary 'zebra' || return 1
+  _check_daemon_binary 'staticd' || return 1
+  watchfrr_daemons='zebra staticd'
+
+  # Create the watchfrr command line.
+  for daemon in \
+babeld bfdd bgpd eigrpd fabricd isisd ldpd nhrpd ospfd ospf6d pbrd \
+pimd ripd ripngd sharpd vrrpd \
+  ; do
+# Trick to read variable name with variable.
+cdaemon=$(eval echo \$$daemon)
+cdaemon_instances=$(eval echo \$${daemon}_instances)
+
+# Add daemon to command line if