From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 83F70138350 for ; Tue, 24 Mar 2020 18:30:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C45F5E090A; Tue, 24 Mar 2020 18:30:23 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A0976E090A for ; Tue, 24 Mar 2020 18:30:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6142934F272 for ; Tue, 24 Mar 2020 18:30:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 183522B for ; Tue, 24 Mar 2020 18:30:03 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1585073016.f1d0b079711fb1903596513e4149a80758a2fa75.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: net-misc/openbgpd/files/, net-misc/openbgpd/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-misc/openbgpd/Manifest net-misc/openbgpd/files/openbgpd-6.6_p0-config.c.patch net-misc/openbgpd/files/openbgpd-9999-config.c.patch net-misc/openbgpd/files/openbgpd-9999-update.patch net-misc/openbgpd/openbgpd-6.6_p0.ebuild net-misc/openbgpd/openbgpd-9999.ebuild X-VCS-Directories: net-misc/openbgpd/files/ net-misc/openbgpd/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: f1d0b079711fb1903596513e4149a80758a2fa75 X-VCS-Branch: master Date: Tue, 24 Mar 2020 18:30:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cc1f2ca9-3603-4ba4-a095-8adba060649b X-Archives-Hash: 803c1fbc9548934f18e4f1cce2f69c9f Message-ID: <20200324183003.XenbT5JdHzoB1GM3xLf996nLXiR26xVZ7IjMMufusx8@z> commit: f1d0b079711fb1903596513e4149a80758a2fa75 Author: Andrew Ammerlaan riseup net> AuthorDate: Tue Mar 24 18:03:36 2020 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Tue Mar 24 18:03:36 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f1d0b079 net-misc/openbgpd: use PATCHES and S variable looks a bit simpler then using src_unpack stuff Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Andrew Ammerlaan riseup.net> net-misc/openbgpd/Manifest | 1 - .../openbgpd/files/openbgpd-6.6_p0-config.c.patch | 4 +- .../openbgpd/files/openbgpd-9999-config.c.patch | 12 ---- net-misc/openbgpd/files/openbgpd-9999-update.patch | 13 ---- net-misc/openbgpd/openbgpd-6.6_p0.ebuild | 13 ++-- net-misc/openbgpd/openbgpd-9999.ebuild | 73 ---------------------- 6 files changed, 6 insertions(+), 110 deletions(-) diff --git a/net-misc/openbgpd/Manifest b/net-misc/openbgpd/Manifest index d746f9e..5d2486d 100644 --- a/net-misc/openbgpd/Manifest +++ b/net-misc/openbgpd/Manifest @@ -1,2 +1 @@ DIST openbgpd-6.6p0.tar.gz 676732 BLAKE2B 80b391ead81d8d3bd20fe9b3eb3f8976485d29241f30c7395c678ff3f0fd87b2f3036b2ebb502ff0ca27d79f4fbbe6ba93576069edb32f004705d71d92e2b3a2 SHA512 07a7599b3ab14181575dc38647b307a4efa7d5dfa8a7aefe70483eb6773cb792eac788a10ea865d78daa59f197fc2d9cd2ce96d0c0251564507963716057fee0 -DIST openbgpd-portable-master.zip 79593 BLAKE2B 7a19522d015076491e698d5dd4434dfaab88ae2dde00b5cbc16122fb3be8a3bbe6906a89ed50d173806298e0e86737f93d7c6be57461ada6c7bb50699a19cbdd SHA512 6d55527c3955457f40c95ff1164f4f6f8c0a8b326c8a632014f83150ffb238eb393053a54b608d650b3756255588b155d537e1a0d228e2961d8f9890e3da641d 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 index e009cdf..32be653 100644 --- a/net-misc/openbgpd/files/openbgpd-6.6_p0-config.c.patch +++ b/net-misc/openbgpd/files/openbgpd-6.6_p0-config.c.patch @@ -1,5 +1,5 @@ ---- src/bgpd/config.c 2020-03-20 17:55:04.089577745 +0100 -+++ src/bgpd/config.c 2020-03-20 17:56:01.480205070 +0100 +--- 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"); diff --git a/net-misc/openbgpd/files/openbgpd-9999-config.c.patch b/net-misc/openbgpd/files/openbgpd-9999-config.c.patch deleted file mode 100644 index a4bda12..0000000 --- a/net-misc/openbgpd/files/openbgpd-9999-config.c.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 -@@ -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/files/openbgpd-9999-update.patch b/net-misc/openbgpd/files/openbgpd-9999-update.patch deleted file mode 100644 index a60752d..0000000 --- a/net-misc/openbgpd/files/openbgpd-9999-update.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- update.sh 2020-03-20 15:14:46.462983445 +0100 -+++ update.sh 2020-03-20 15:14:56.473090379 +0100 -@@ -13,10 +13,6 @@ - git clone "${OPENBGPD_GIT}/openbsd" - fi - fi --(cd openbsd -- git fetch -- git checkout "${openbsd_branch}" -- git pull --rebase) - - # setup source paths - dir=`pwd` diff --git a/net-misc/openbgpd/openbgpd-6.6_p0.ebuild b/net-misc/openbgpd/openbgpd-6.6_p0.ebuild index 6f9d476..2dd151e 100644 --- a/net-misc/openbgpd/openbgpd-6.6_p0.ebuild +++ b/net-misc/openbgpd/openbgpd-6.6_p0.ebuild @@ -6,7 +6,6 @@ EAPI=7 inherit systemd MY_PV="${PV/_p/p}" -#MY_PN="openbgpd-portable" MY_P="${PN}-${MY_PV}" DESCRIPTION="OpenBGPD is a free implementation of BGPv4" @@ -28,15 +27,11 @@ BDEPEND=" sys-devel/libtool " -src_unpack() { - default - mv "${WORKDIR}/${MY_P}" "${S}" -} +S="${WORKDIR}/${MY_P}" -src_prepare() { - eapply -p0 "${FILESDIR}/${P}-config.c.patch" - default -} +PATCHES=( + "${FILESDIR}/${P}-config.c.patch" +) src_install() { default diff --git a/net-misc/openbgpd/openbgpd-9999.ebuild b/net-misc/openbgpd/openbgpd-9999.ebuild deleted file mode 100644 index 74d73a7..0000000 --- a/net-misc/openbgpd/openbgpd-9999.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools git-r3 systemd - -MY_PV="master" -MY_PN="openbgpd-portable" -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="OpenBGPD is a free implementation of BGPv4" -HOMEPAGE="http://www.openbgpd.org/index.html" -SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/master.zip -> ${MY_P}.zip" - -EGIT_REPO_URI="https://github.com/openbgpd-portable/openbgpd-openbsd.git" -EGIT3_STORE_DIR="${S}/git" -EGIT_CHECKOUT_DIR="${S}/openbsd" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="" -IUSE="" - -DEPEND="" -RDEPEND=" - ${DEPEND} - acct-group/_bgpd - acct-user/_bgpd -" -BDEPEND=" - dev-util/byacc - sys-devel/autoconf - sys-devel/automake - sys-devel/libtool -" - -src_unpack() { - unpack ${A} - mv "${WORKDIR}/${MY_P}" "${S}" - - EGIT_BRANCH=$(cat "${S}"/OPENBSD_BRANCH) - git-r3_fetch - git-r3_checkout -} - -src_prepare() { - eapply -p0 "${FILESDIR}/${P}-update.patch" - eapply -p0 "${FILESDIR}/${P}-config.c.patch" - default - ./autogen.sh - eautoreconf -} - -src_configure() { - export YACC=byacc - default -} - -src_install() { - default - - newinitd "${FILESDIR}/${PN}-init.d" bgpd - newconfd "${FILESDIR}/${PN}-conf.d" bgpd - systemd_newunit "${FILESDIR}/${PN}.service" bgpd.service -} - -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 "" -}