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

[Andrew Ammerlaan]

commit:     84e4a4dfecd6c2eb9d4f24bb63f54662643758bf
Author:     Alarig Le Lay <alarig <AT> swordarmor <DOT> fr>
AuthorDate: Fri May 29 04:50:31 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Fri May 29 04:57:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=84e4a4df

net-misc/openbgpd: Version bump to 6.7

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alarig Le Lay <alarig <AT> swordarmor.fr>

 net-misc/openbgpd/Manifest                         |  1 +
 .../openbgpd/files/openbgpd-9999-config.c.patch    |  4 ++--
 net-misc/openbgpd/files/openbgpd-9999-update.patch |  4 ++--
 net-misc/openbgpd/openbgpd-6.6_p0.ebuild           | 12 +++++++----
 ...enbgpd-6.6_p0.ebuild => openbgpd-6.7_p0.ebuild} | 16 +++++++--------
 net-misc/openbgpd/openbgpd-9999.ebuild             | 24 +++++++++++++---------
 6 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/net-misc/openbgpd/Manifest b/net-misc/openbgpd/Manifest
index 5d2486d..5e4abe2 100644
--- a/net-misc/openbgpd/Manifest
+++ b/net-misc/openbgpd/Manifest
@@ -1 +1,2 @@
 DIST openbgpd-6.6p0.tar.gz 676732 BLAKE2B 80b391ead81d8d3bd20fe9b3eb3f8976485d29241f30c7395c678ff3f0fd87b2f3036b2ebb502ff0ca27d79f4fbbe6ba93576069edb32f004705d71d92e2b3a2 SHA512 07a7599b3ab14181575dc38647b307a4efa7d5dfa8a7aefe70483eb6773cb792eac788a10ea865d78daa59f197fc2d9cd2ce96d0c0251564507963716057fee0
+DIST openbgpd-6.7p0.tar.gz 699211 BLAKE2B 981105c3a9ba6a7b143ad6d926459382686f23b6355392fedaecaaf572c0d6054f6ce7656eaf7461d5bdc753e0be3d70f7ae44ee85395fd0d310d2bef7251bf8 SHA512 7309fe00ada74503ae6c739886e8a78af6cba93cbe6d29f9656eb95f96124401ac7b00ebe1b345b1c786582f661c72caf22c9193968662db2a1f19703f34cd2e

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 2dd151e..c4b1f50 100644
--- a/net-misc/openbgpd/openbgpd-6.6_p0.ebuild
+++ b/net-misc/openbgpd/openbgpd-6.6_p0.ebuild
@@ -20,6 +20,7 @@ IUSE=""
 DEPEND=""
 RDEPEND="
 	${DEPEND}
+	!!net-misc/quagga
 	acct-group/_bgpd
 	acct-user/_bgpd
 "
@@ -42,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-6.6_p0.ebuild b/net-misc/openbgpd/openbgpd-6.7_p0.ebuild
similarity index 73%
copy from net-misc/openbgpd/openbgpd-6.6_p0.ebuild
copy to net-misc/openbgpd/openbgpd-6.7_p0.ebuild
index 2dd151e..ccd7a6b 100644
--- a/net-misc/openbgpd/openbgpd-6.6_p0.ebuild
+++ b/net-misc/openbgpd/openbgpd-6.7_p0.ebuild
@@ -20,6 +20,7 @@ IUSE=""
 DEPEND=""
 RDEPEND="
 	${DEPEND}
+	!!net-misc/quagga
 	acct-group/_bgpd
 	acct-user/_bgpd
 "
@@ -29,10 +30,6 @@ BDEPEND="
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-config.c.patch"
-)
-
 src_install() {
 	default
 
@@ -42,8 +39,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
 }