Merge updates from master

This commit is contained in:
Repository mirror & CI
2020-03-24 19:06:21 +00:00
13 changed files with 6 additions and 138 deletions

View File

@@ -5,8 +5,4 @@
<email>gentoo@aisha.cc</email>
<name>Aisha Tammy</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
</pkgmetadata>

View File

@@ -5,8 +5,4 @@
<email>gentoo@aisha.cc</email>
<name>Aisha Tammy</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
</pkgmetadata>

View File

@@ -5,8 +5,4 @@
<email>gentoo@aisha.cc</email>
<name>Aisha Tammy</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
</pkgmetadata>

View File

@@ -5,10 +5,6 @@
<email>gentoo@aisha.cc</email>
<name>Aisha Tammy</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<use>
<flag name='docs'>Add the internal documentation, not needed for non-developers.</flag>
<flag name='examples'>Adds examples for using, not needed for non-developers.</flag>

View File

@@ -5,10 +5,6 @@
<email>gentoo@aisha.cc</email>
<name>Aisha Tammy</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<use>
<flag name='wf-config'>Makes wayfire use the system-wide wf-config, else builds it as a submodule. DO NOT DISABLE UNLESS YOU KNOW WHAT YOU ARE DOING.</flag>
<flag name='wlroots'>Makes wayfire use the system wide wlroots, else builds it as a submodule. DO NOT DISABLE UNLESS YOU KNOW WHAT YOU ARE DOING.</flag>

View File

@@ -5,10 +5,6 @@
<email>gentoo@aisha.cc</email>
<name>Aisha Tammy</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<use>
<flag name='notmuch'>Pulls in notmuch (thin frontend on xapian). HIGHLY RECOMMENDED.</flag>
<flag name='lynx'>Use lynx to view html emails in mutt. HIGHLY RECOMMENDED.</flag>

View File

@@ -1,2 +1 @@
DIST openbgpd-6.6p0.tar.gz 676732 BLAKE2B 80b391ead81d8d3bd20fe9b3eb3f8976485d29241f30c7395c678ff3f0fd87b2f3036b2ebb502ff0ca27d79f4fbbe6ba93576069edb32f004705d71d92e2b3a2 SHA512 07a7599b3ab14181575dc38647b307a4efa7d5dfa8a7aefe70483eb6773cb792eac788a10ea865d78daa59f197fc2d9cd2ce96d0c0251564507963716057fee0
DIST openbgpd-portable-master.zip 79593 BLAKE2B 7a19522d015076491e698d5dd4434dfaab88ae2dde00b5cbc16122fb3be8a3bbe6906a89ed50d173806298e0e86737f93d7c6be57461ada6c7bb50699a19cbdd SHA512 6d55527c3955457f40c95ff1164f4f6f8c0a8b326c8a632014f83150ffb238eb393053a54b608d650b3756255588b155d537e1a0d228e2961d8f9890e3da641d

View File

@@ -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");

View File

@@ -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 */

View File

@@ -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`

View File

@@ -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

View File

@@ -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) cant export its RIB to"
ewarn "the FIB. Its only suitable for route-reflectors or route-servers."
ewarn ""
}

View File

@@ -5,8 +5,4 @@
<email>gentoo@aisha.cc</email>
<name>Aisha Tammy</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
</pkgmetadata>