net-misc/bird: drop 2.0.7, 2.0.7-r1

net-misc/bird/Manifest

@@ -1,5 +1,4 @@
 DIST bird-1.6.8.tar.gz 1042222 BLAKE2B 65974c936a711dfa14d43817a4d23420ebbed317da4ec6211a2e36f031af917f90e34f4ab580802552cf5c506d819dbee663716b9a765ae9f2906ea44ab5cec6 SHA512 0a777ea1b7e613bd1048e7baf83c2f3636fd50b79b2b9570ab3db3e0981ce3703836d69f6fb1143222d8d4c6883936014a04d303e3c07c4ce1e6e60c938616d0
 DIST bird-2.0.10.tar.gz 1276546 BLAKE2B 21e1dde7d38d836c761eb13067b6aacdfc66211ca75f4ae72948f2c3a9519ac45af410f764c638e9a7314c51873675621feabc730e0604a42c00f054b0db1017 SHA512 607f9c96bbf55b7622a8c49126ad568ce9a220520801a13e89be63eee65a76c575a8095485e5bbd867d1306fed87c8394a82fe88d76307eaa40ee5902842d158
-DIST bird-2.0.7.tar.gz 1993395 BLAKE2B ceb88d811d254e57e089ef4b4e1e4f34fd96d4622d9f5563cc8694323c060e99d6cdfccfeb5d8c885b9431dc71e96d5cc04e4344901a7c7d899f4249e7503720 SHA512 48ca63be923285dd282e80d7e2b240256953fd7ad4f6eaa5dcba2648f3f148be20198bc8c6e7e888aac1588ecb005a4f4c03e979853e76ea6f8680643a874b35
 DIST bird-2.0.8.tar.gz 1135228 BLAKE2B 4b36688ac85967ad8c39d9c37dc717d77b1cb5c3ec44a0cf4e84ff38b8d1710d10653a1333b50cd2ede79fd7f012ec86de0baefc9ac18435693ec5b3e43b8a3a SHA512 5f8ad63b1dcdcfdfd4c98f55601dda3a07dea3099fc51b52a340650ca475bd943ee6aac31a1e7735b7596b279e338697c65728754b97108ae687a05f566c94e2
 DIST bird-2.0.9.tar.gz 1282045 BLAKE2B a9f60ac7a768793e985ff8edc4c42af4b5e0eb9028af575d12e2fbe9ea67092cdc908289be848ef71403e6fafdcf46a8b78e90a5880951f9cb09854a3a3f0c73 SHA512 14c1f5c792de58e1b89ce16ea942244ad998833cf159a3cde78fd0c7d81238b1ad18fd76f6a0e7e11210447c73a6c74cfef4c6a70989891fa78ba5df0ae71d90

net-misc/bird/bird-2.0.7-r1.ebuild

@@ -1,64 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps
-
-DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6"
-HOMEPAGE="https://bird.network.cz"
-SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86 ~x64-macos"
-IUSE="+client debug libssh"
-
-RDEPEND="
-	client? ( sys-libs/ncurses:= )
-	client? ( sys-libs/readline:= )
-	filecaps? (
-		acct-group/bird
-		acct-user/bird
-	)
-	libssh? ( net-libs/libssh:= )"
-BDEPEND="sys-devel/flex
-	sys-devel/bison
-	sys-devel/m4"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ipv6-rpki.patch"
-	"${FILESDIR}/${P}-attrs.c.patch"
-)
-
-FILECAPS=(
-	CAP_NET_ADMIN			usr/sbin/bird
-	CAP_NET_BIND_SERVICE	usr/sbin/bird
-	CAP_NET_RAW				usr/sbin/bird
-)
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable client) \
-		$(use_enable debug) \
-		$(use_enable libssh)
-}
-
-src_install() {
-	if use client; then
-		dobin birdc
-	fi
-	dobin birdcl
-	dosbin bird
-	newinitd "${FILESDIR}/initd-${PN}-2" ${PN}
-	newconfd "${FILESDIR}/confd-${PN}-2" ${PN}
-	dodoc doc/bird.conf.example
-}
-
-pkg_postinst() {
-	use filecaps && \
-		einfo "If you want to run bird as non-root, edit"
-		einfo "'${EROOT}/etc/conf.d/bird' and set BIRD_GROUP and BIRD_USER with"
-		einfo "the wanted username."
-}

net-misc/bird/bird-2.0.7.ebuild

@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6"
-HOMEPAGE="http://bird.network.cz"
-SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
-IUSE="+client debug"
-
-RDEPEND="client? ( sys-libs/ncurses )
-	client? ( sys-libs/readline )"
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	sys-devel/m4"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc10.patch"
-)
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable client) \
-		$(use_enable debug)
-}
-
-src_install() {
-	if use client; then
-		dobin birdc
-	fi
-	dobin birdcl
-	dosbin bird
-	newinitd "${FILESDIR}/initd-${PN}-2" bird
-	dodoc doc/bird.conf.example
-}

net-misc/bird/files/bird-2.0.7-attrs.c.patch

@@ -1,33 +0,0 @@
-diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
-index b8921363..9a4e12d2 100644
---- a/proto/bgp/attrs.c
-+++ b/proto/bgp/attrs.c
-@@ -717,13 +717,23 @@ bgp_decode_mp_unreach_nlri(struct bgp_parse_state *s, uint code UNUSED, uint fla
- static void
- bgp_export_ext_community(struct bgp_export_state *s, eattr *a)
- {
--  struct adata *ad = ec_set_del_nontrans(s->pool, a->u.ptr);
-+  if (!s->proto->is_interior)
-+  {
-+    struct adata *ad = ec_set_del_nontrans(s->pool, a->u.ptr);
- 
--  if (ad->length == 0)
--    UNSET(a);
-+    if (ad->length == 0)
-+      UNSET(a);
- 
--  ec_set_sort_x(ad);
--  a->u.ptr = ad;
-+    ec_set_sort_x(ad);
-+    a->u.ptr = ad;
-+  }
-+  else
-+  {
-+    if (a->u.ptr->length == 0)
-+      UNSET(a);
-+
-+    a->u.ptr = ec_set_sort(s->pool, a->u.ptr);
-+  }
- }
- 
- static void

net-misc/bird/files/bird-2.0.7-gcc10.patch

@@ -1,12 +0,0 @@
-diff -ruN bird-2.0.7.orig/nest/route.h bird-2.0.7/nest/route.h
---- bird-2.0.7.orig/nest/route.h	2019-10-16 13:45:52.000000000 +0300
-+++ bird-2.0.7/nest/route.h	2020-11-01 02:59:41.199775491 +0200
-@@ -458,7 +458,7 @@
- 					   protocol-specific metric is availabe */
- 
- 
--const char * rta_dest_names[RTD_MAX];
-+extern const char * rta_dest_names[RTD_MAX];
- 
- static inline const char *rta_dest_name(uint n)
- { return (n < RTD_MAX) ? rta_dest_names[n] : "???"; }

net-misc/bird/files/bird-2.0.7-ipv6-rpki.patch

@@ -1,29 +0,0 @@
-diff --git a/proto/rpki/transport.c b/proto/rpki/transport.c
-index 182667be..9dcb7c5c 100644
---- a/proto/rpki/transport.c
-+++ b/proto/rpki/transport.c
-@@ -26,7 +26,6 @@
- static ip_addr
- rpki_hostname_autoresolv(const char *host)
- {
--  ip_addr addr = {};
-   struct addrinfo *res;
-   struct addrinfo hints = {
-       .ai_family = AF_UNSPEC,
-@@ -44,12 +43,10 @@ rpki_hostname_autoresolv(const char *host)
-     return IPA_NONE;
-   }
- 
--  sockaddr sa = {
--      .sa = *res->ai_addr,
--  };
--
-+  ip_addr addr = IPA_NONE;
-   uint unused;
--  sockaddr_read(&sa, res->ai_family, &addr, NULL, &unused);
-+
-+  sockaddr_read((sockaddr *) res->ai_addr, res->ai_family, &addr, NULL, &unused);
- 
-   freeaddrinfo(res);
-   return addr;
-