[gentoo-commits] repo/proj/guru:master commit in: net-misc/openbgpd/files/, net-misc/openbgpd/

["Haelwenn Monnier" <contact@hacktivis.me>]

commit:     3956b9a49e283cc92610b12d67f6243a4add5f6a
Author:     Alarig Le Lay <alarig <AT> swordarmor <DOT> fr>
AuthorDate: Fri Jul 14 13:01:07 2023 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Fri Jul 14 13:02:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3956b9a4

net-misc/openbgpd: add 8.0, drop 6.8_p0

Signed-off-by: Alarig Le Lay <alarig <AT> swordarmor.fr>

 net-misc/openbgpd/Manifest                                   |  2 +-
 net-misc/openbgpd/files/openbgpd-6.6_p0-config.c.patch       | 12 ------------
 .../openbgpd/{openbgpd-6.8_p0.ebuild => openbgpd-8.0.ebuild} | 11 +++--------
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/net-misc/openbgpd/Manifest b/net-misc/openbgpd/Manifest
index 41c12287e..9b118b62d 100644
--- a/net-misc/openbgpd/Manifest
+++ b/net-misc/openbgpd/Manifest
@@ -1,2 +1,2 @@
-DIST openbgpd-6.8p0.tar.gz 701164 BLAKE2B 458e3aeab026b3c2ee3f676d35d657ef2b8b9b2cb11efc6a32f18c387e6f08594fa3e736b53f9413e9ec59139adfd3c89d26da780bcdcb4b2925124cf9a1ea05 SHA512 0c99a94a9a1401c22a3400d424ac1e682bdab92d09844717f8bb576c0ede67140d918f48c15b318abebf21b39468333f8f1c2d963a1541f4ead9067f85434a94
 DIST openbgpd-6.9p0.tar.gz 719173 BLAKE2B 13360fdec909fbb18e4b9f71cb6751c406bb58a685d51bbb9caa38302f4dd1d91ba7a3ed90eac308f57851410fdf9b21652266f29488f086bba4b3ec24844efe SHA512 ba6f73aeb03e798fd081f67fc500d24e0b2efdb9564fe5f294460abc8e66762692177a1238f8f0372ca74e0ad9c11aa9f640e50cd0978198639655b3985240bc
+DIST openbgpd-8.0.tar.gz 837979 BLAKE2B 64c9ea56e1e9944271d3ab72e2eed738841c3e2904b919f987a52e1adf95b137c20d31a738595ff48a113cdde603e8e5aac2cb4d0c7f7e17399111358b0e7a72 SHA512 9d0c8b6e8c3d46b2510817c750e2faf1e79609becbe66eb02731317db3c2c455273a1135abfae3d32bcc970e02f55c90091e478334ec94dcd46ba5074d3b9b12

diff --git a/net-misc/openbgpd/files/openbgpd-6.6_p0-config.c.patch b/net-misc/openbgpd/files/openbgpd-6.6_p0-config.c.patch
deleted file mode 100644
index 32be6531f..000000000
--- a/net-misc/openbgpd/files/openbgpd-6.6_p0-config.c.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/bgpd/config.c	2020-03-20 17:55:04.089577745 +0100
-+++ b/src/bgpd/config.c	2020-03-20 17:56:01.480205070 +0100
-@@ -343,7 +343,8 @@
- 		fatal("getifaddrs");
- 
- 	for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
--		if (ifa->ifa_addr->sa_family != AF_INET)
-+		if (ifa->ifa_addr == NULL ||
-+		    ifa->ifa_addr->sa_family != AF_INET)
- 			continue;
- 		cur = ((struct sockaddr_in *)ifa->ifa_addr)->sin_addr.s_addr;
- 		if ((cur & localnet) == localnet)	/* skip 127/8 */

diff --git a/net-misc/openbgpd/openbgpd-6.8_p0.ebuild b/net-misc/openbgpd/openbgpd-8.0.ebuild
similarity index 86%
rename from net-misc/openbgpd/openbgpd-6.8_p0.ebuild
rename to net-misc/openbgpd/openbgpd-8.0.ebuild
index fc029efd1..f6272cfcb 100644
--- a/net-misc/openbgpd/openbgpd-6.8_p0.ebuild
+++ b/net-misc/openbgpd/openbgpd-8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic systemd
+inherit systemd
 
 MY_PV="${PV/_p/p}"
 MY_P="${PN}-${MY_PV}"
@@ -20,7 +20,7 @@ IUSE=""
 DEPEND=""
 RDEPEND="
 	${DEPEND}
-	!!net-misc/quagga
+	!!net-misc/frr
 	acct-group/_bgpd
 	acct-user/_bgpd
 "
@@ -38,11 +38,6 @@ src_install() {
 	systemd_newunit "${FILESDIR}/${PN}.service" bgpd.service
 }
 
-src_configure() {
-	append-cflags -fcommon
-	default
-}
-
 pkg_postinst() {
 	if [ -z "${REPLACING_VERSIONS}" ]; then
 		ewarn ""