From ce7a3218ad35667a9e798f230f58bc410aeec259 Mon Sep 17 00:00:00 2001 From: Alarig Le Lay Date: Mon, 4 May 2020 18:37:25 +0200 Subject: [PATCH] net-misc/openbgpd: Improvements Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Alarig Le Lay --- .../files/openbgpd-9999-config.c.patch | 4 ++-- .../openbgpd/files/openbgpd-9999-update.patch | 4 ++-- net-misc/openbgpd/openbgpd-6.6_p0.ebuild | 11 +++++---- net-misc/openbgpd/openbgpd-9999.ebuild | 24 +++++++++++-------- 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/net-misc/openbgpd/files/openbgpd-9999-config.c.patch b/net-misc/openbgpd/files/openbgpd-9999-config.c.patch index a4bda12..edda6fb 100644 --- a/net-misc/openbgpd/files/openbgpd-9999-config.c.patch +++ b/net-misc/openbgpd/files/openbgpd-9999-config.c.patch @@ -1,5 +1,5 @@ ---- openbsd/src/usr.sbin/bgpd/config.c 2020-03-20 17:55:04.089577745 +0100 -+++ openbsd/src/usr.sbin/bgpd/config.c 2020-03-20 17:56:01.480205070 +0100 +--- a/openbsd/src/usr.sbin/bgpd/config.c 2020-03-20 17:55:04.089577745 +0100 ++++ b/openbsd/src/usr.sbin/bgpd/config.c 2020-03-20 17:56:01.480205070 +0100 @@ -343,7 +343,8 @@ fatal("getifaddrs"); diff --git a/net-misc/openbgpd/files/openbgpd-9999-update.patch b/net-misc/openbgpd/files/openbgpd-9999-update.patch index a60752d..15969c0 100644 --- a/net-misc/openbgpd/files/openbgpd-9999-update.patch +++ b/net-misc/openbgpd/files/openbgpd-9999-update.patch @@ -1,5 +1,5 @@ ---- update.sh 2020-03-20 15:14:46.462983445 +0100 -+++ update.sh 2020-03-20 15:14:56.473090379 +0100 +--- a/update.sh 2020-03-20 15:14:46.462983445 +0100 ++++ b/update.sh 2020-03-20 15:14:56.473090379 +0100 @@ -13,10 +13,6 @@ git clone "${OPENBGPD_GIT}/openbsd" fi diff --git a/net-misc/openbgpd/openbgpd-6.6_p0.ebuild b/net-misc/openbgpd/openbgpd-6.6_p0.ebuild index ac7a997..c4b1f50 100644 --- a/net-misc/openbgpd/openbgpd-6.6_p0.ebuild +++ b/net-misc/openbgpd/openbgpd-6.6_p0.ebuild @@ -43,8 +43,11 @@ src_install() { } pkg_postinst() { - ewarn "" - ewarn "OpenBGPD portable (not running on OpenBSD) can’t export its RIB to" - ewarn "the FIB. It’s only suitable for route-reflectors or route-servers." - ewarn "" + if [ -z "${REPLACING_VERSIONS}" ]; then + ewarn "" + ewarn "OpenBGPD portable (not running on OpenBSD) can’t export its RIB" + ewarn "to the FIB. It’s only suitable for route-reflectors or" + ewarn "route-servers." + ewarn "" + fi } diff --git a/net-misc/openbgpd/openbgpd-9999.ebuild b/net-misc/openbgpd/openbgpd-9999.ebuild index a7ba284..53a836b 100644 --- a/net-misc/openbgpd/openbgpd-9999.ebuild +++ b/net-misc/openbgpd/openbgpd-9999.ebuild @@ -6,8 +6,8 @@ EAPI=7 inherit autotools git-r3 systemd DESCRIPTION="OpenBGPD is a free implementation of BGPv4" -HOMEPAGE="http://www.openbgpd.org/index.html" -EGIT_REPO_URI="https://github.com/openbgpd-portable/openbgpd-portable.git" +HOMEPAGE="http://www.openbgpd.org/" +EGIT_REPO_URI="https://github.com/${PN}-portable/${PN}-portable.git" LICENSE="ISC" SLOT="0" @@ -23,11 +23,14 @@ RDEPEND=" " BDEPEND=" dev-util/byacc - sys-devel/autoconf - sys-devel/automake sys-devel/libtool " +PATCHES=( + "${FILESDIR}/${P}-update.patch" + "${FILESDIR}/${P}-config.c.patch" +) + src_unpack() { git-r3_src_unpack @@ -41,8 +44,6 @@ src_unpack() { } src_prepare() { - eapply -p0 "${FILESDIR}/${P}-update.patch" - eapply -p0 "${FILESDIR}/${P}-config.c.patch" default ./autogen.sh eautoreconf @@ -62,8 +63,11 @@ src_install() { } pkg_postinst() { - ewarn "" - ewarn "OpenBGPD portable (not running on OpenBSD) can’t export its RIB to" - ewarn "the FIB. It’s only suitable for route-reflectors or route-servers." - ewarn "" + if [ -z "${REPLACING_VERSIONS}" ]; then + ewarn "" + ewarn "OpenBGPD portable (not running on OpenBSD) can’t export its RIB" + ewarn "to the FIB. It’s only suitable for route-reflectors or" + ewarn "route-servers." + ewarn "" + fi }