From 416d476cba816e06829bf1209ae5944acd541d77 Mon Sep 17 00:00:00 2001 From: Alarig Le Lay Date: Thu, 26 Dec 2024 18:16:50 +0100 Subject: [PATCH] net-misc/openbgpd: fix local state dir Signed-off-by: Alarig Le Lay --- metadata/md5-cache/acct-group/_bgpd-0 | 2 +- metadata/md5-cache/acct-user/_bgpd-0 | 2 +- metadata/md5-cache/net-misc/frr-10.0 | 2 +- metadata/md5-cache/net-misc/frr-9.1 | 2 +- metadata/md5-cache/net-misc/openbgpd-8.4 | 2 +- metadata/md5-cache/net-misc/openbgpd-8.5 | 2 +- metadata/md5-cache/net-misc/openbgpd-8.6 | 6 +- metadata/md5-cache/net-misc/openbgpd-9999 | 2 +- net-misc/openbgpd/openbgpd-8.6.ebuild | 8 +++ net-misc/openbgpd/openbgpd-9999.ebuild | 73 ----------------------- 10 files changed, 18 insertions(+), 83 deletions(-) delete mode 100644 net-misc/openbgpd/openbgpd-9999.ebuild diff --git a/metadata/md5-cache/acct-group/_bgpd-0 b/metadata/md5-cache/acct-group/_bgpd-0 index 8e5ce74..a2446fc 100644 --- a/metadata/md5-cache/acct-group/_bgpd-0 +++ b/metadata/md5-cache/acct-group/_bgpd-0 @@ -4,5 +4,5 @@ EAPI=7 INHERIT=acct-group KEYWORDS=~amd64 ~x86 SLOT=0 -_eclasses_=user-info 9951b1a0e4f026d16c33a001fd2d5cdf acct-group 8c6e16e1203a4a4114b121c04ee5e474 +_eclasses_=user-info 9951b1a0e4f026d16c33a001fd2d5cdf acct-group c2bb1fc7bada6e119b3ce202ca42476f _md5_=17e7bcd01acf76a2637af53b76f8cf38 diff --git a/metadata/md5-cache/acct-user/_bgpd-0 b/metadata/md5-cache/acct-user/_bgpd-0 index 6667d24..80a1aff 100644 --- a/metadata/md5-cache/acct-user/_bgpd-0 +++ b/metadata/md5-cache/acct-user/_bgpd-0 @@ -5,5 +5,5 @@ INHERIT=acct-user KEYWORDS=~amd64 ~x86 RDEPEND=acct-group/_bgpd SLOT=0 -_eclasses_=user-info 9951b1a0e4f026d16c33a001fd2d5cdf acct-user bab50e8bac8e1df6a32a6b9e2fb19a64 +_eclasses_=user-info 9951b1a0e4f026d16c33a001fd2d5cdf acct-user a4bf64e6c32b95705287346a2b678ae1 _md5_=d4dce79d12f7fe3f3e592efdd7bb8ae0 diff --git a/metadata/md5-cache/net-misc/frr-10.0 b/metadata/md5-cache/net-misc/frr-10.0 index 7b965b8..d8cffad 100644 --- a/metadata/md5-cache/net-misc/frr-10.0 +++ b/metadata/md5-cache/net-misc/frr-10.0 @@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1 RESTRICT=!test? ( test ) SLOT=0 SRC_URI=https://github.com/FRRouting/frr/archive/frr-10.0.tar.gz -_eclasses_=gnuconfig a397adda6984a4c423e28ac274c1ba98 toolchain-funcs e56c7649b804f051623c8bc1a1c44084 multilib c19072c3cd7ac5cb21de013f7e9832e0 libtool 5f49a16f67f81bdf873e3d1f10b10001 autotools d12ccbad07b44642a75ac97a3334d8e0 flag-o-matic e503ea5acc20410237ba33ec3f7c857d pam b56d0c9c20fc5b553f13c8ae165a10a5 eapi8-dosym 5ac4857ad078256d939c44f7c64197a9 multiprocessing 30ead54fa2e2b5f9cd4e612ffc34d0fe python-utils-r1 8b220bbce5c119fb1d4d5c2f5588f3ea python-single-r1 75118e916668a74c660a13b0ecb22562 systemd c8b03e8df84486aa991d4396686e8942 +_eclasses_=gnuconfig ddeb9f8caff1b5f71a09c75b7534df79 toolchain-funcs fa554cc3cff825d21dfe3f24841e29cf multilib b2a329026f2e404e9e371097dda47f96 libtool 6b28392a775f807c8be5fc7ec9a605b9 autotools 7d91cc798a8afd8f4e0c6e9587296ebe flag-o-matic f14aba975c94ccaa9f357a27e3b17ffe pam b56d0c9c20fc5b553f13c8ae165a10a5 eapi8-dosym 5ac4857ad078256d939c44f7c64197a9 multiprocessing 1e32df7deee68372153dca65f4a7c21f python-utils-r1 42c5abe4a656a4993a06a4fc61dbdd12 python-single-r1 47d8ac9be330c9366112b78fd4f8ce57 systemd 54bd206bb5c4efac6ae28b6b006713b0 _md5_=eee8087a8fa00445ed9aaa15cc482a87 diff --git a/metadata/md5-cache/net-misc/frr-9.1 b/metadata/md5-cache/net-misc/frr-9.1 index 3bac631..94b65ae 100644 --- a/metadata/md5-cache/net-misc/frr-9.1 +++ b/metadata/md5-cache/net-misc/frr-9.1 @@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_1 RESTRICT=!test? ( test ) SLOT=0 SRC_URI=https://github.com/FRRouting/frr/archive/frr-9.1.tar.gz -_eclasses_=gnuconfig a397adda6984a4c423e28ac274c1ba98 toolchain-funcs e56c7649b804f051623c8bc1a1c44084 multilib c19072c3cd7ac5cb21de013f7e9832e0 libtool 5f49a16f67f81bdf873e3d1f10b10001 autotools d12ccbad07b44642a75ac97a3334d8e0 flag-o-matic e503ea5acc20410237ba33ec3f7c857d pam b56d0c9c20fc5b553f13c8ae165a10a5 eapi8-dosym 5ac4857ad078256d939c44f7c64197a9 multiprocessing 30ead54fa2e2b5f9cd4e612ffc34d0fe python-utils-r1 8b220bbce5c119fb1d4d5c2f5588f3ea python-single-r1 75118e916668a74c660a13b0ecb22562 systemd c8b03e8df84486aa991d4396686e8942 +_eclasses_=gnuconfig ddeb9f8caff1b5f71a09c75b7534df79 toolchain-funcs fa554cc3cff825d21dfe3f24841e29cf multilib b2a329026f2e404e9e371097dda47f96 libtool 6b28392a775f807c8be5fc7ec9a605b9 autotools 7d91cc798a8afd8f4e0c6e9587296ebe flag-o-matic f14aba975c94ccaa9f357a27e3b17ffe pam b56d0c9c20fc5b553f13c8ae165a10a5 eapi8-dosym 5ac4857ad078256d939c44f7c64197a9 multiprocessing 1e32df7deee68372153dca65f4a7c21f python-utils-r1 42c5abe4a656a4993a06a4fc61dbdd12 python-single-r1 47d8ac9be330c9366112b78fd4f8ce57 systemd 54bd206bb5c4efac6ae28b6b006713b0 _md5_=9905ad408836c2c7149926e770647999 diff --git a/metadata/md5-cache/net-misc/openbgpd-8.4 b/metadata/md5-cache/net-misc/openbgpd-8.4 index 0d251f4..d7eada5 100644 --- a/metadata/md5-cache/net-misc/openbgpd-8.4 +++ b/metadata/md5-cache/net-misc/openbgpd-8.4 @@ -9,5 +9,5 @@ LICENSE=ISC RDEPEND=!!net-misc/frr acct-group/_bgpd acct-user/_bgpd SLOT=0 SRC_URI=mirror://openbsd/OpenBGPD/openbgpd-8.4.tar.gz -_eclasses_=toolchain-funcs 333970c740aa7b1a92e4fcdc52f612bd multilib c19072c3cd7ac5cb21de013f7e9832e0 systemd c8b03e8df84486aa991d4396686e8942 +_eclasses_=toolchain-funcs fa554cc3cff825d21dfe3f24841e29cf multilib b2a329026f2e404e9e371097dda47f96 systemd 54bd206bb5c4efac6ae28b6b006713b0 _md5_=8b92058a494b0061051bd28d0926748d diff --git a/metadata/md5-cache/net-misc/openbgpd-8.5 b/metadata/md5-cache/net-misc/openbgpd-8.5 index cec75a8..718e94d 100644 --- a/metadata/md5-cache/net-misc/openbgpd-8.5 +++ b/metadata/md5-cache/net-misc/openbgpd-8.5 @@ -9,5 +9,5 @@ LICENSE=ISC RDEPEND=!!net-misc/frr acct-group/_bgpd acct-user/_bgpd SLOT=0 SRC_URI=mirror://openbsd/OpenBGPD/openbgpd-8.5.tar.gz -_eclasses_=toolchain-funcs 333970c740aa7b1a92e4fcdc52f612bd multilib c19072c3cd7ac5cb21de013f7e9832e0 systemd c8b03e8df84486aa991d4396686e8942 +_eclasses_=toolchain-funcs fa554cc3cff825d21dfe3f24841e29cf multilib b2a329026f2e404e9e371097dda47f96 systemd 54bd206bb5c4efac6ae28b6b006713b0 _md5_=8b92058a494b0061051bd28d0926748d diff --git a/metadata/md5-cache/net-misc/openbgpd-8.6 b/metadata/md5-cache/net-misc/openbgpd-8.6 index 9eb93c8..66d1ba6 100644 --- a/metadata/md5-cache/net-misc/openbgpd-8.6 +++ b/metadata/md5-cache/net-misc/openbgpd-8.6 @@ -1,5 +1,5 @@ BDEPEND=dev-build/libtool virtual/pkgconfig -DEFINED_PHASES=install postinst +DEFINED_PHASES=configure install postinst DEPEND=!!net-misc/frr acct-group/_bgpd acct-user/_bgpd dev-libs/libevent net-libs/libmnl DESCRIPTION=OpenBGPD is a free implementation of BGPv4 EAPI=8 @@ -10,5 +10,5 @@ LICENSE=ISC RDEPEND=!!net-misc/frr acct-group/_bgpd acct-user/_bgpd dev-libs/libevent net-libs/libmnl SLOT=0 SRC_URI=mirror://openbsd/OpenBGPD/openbgpd-8.6.tar.gz -_eclasses_=toolchain-funcs 333970c740aa7b1a92e4fcdc52f612bd multilib c19072c3cd7ac5cb21de013f7e9832e0 systemd c8b03e8df84486aa991d4396686e8942 -_md5_=468d820ee512fd3e0205015f65e1cc5a +_eclasses_=toolchain-funcs fa554cc3cff825d21dfe3f24841e29cf multilib b2a329026f2e404e9e371097dda47f96 systemd 54bd206bb5c4efac6ae28b6b006713b0 +_md5_=fa5c88eea06dd4ecb3c8c0d7e92e37ed diff --git a/metadata/md5-cache/net-misc/openbgpd-9999 b/metadata/md5-cache/net-misc/openbgpd-9999 index c235005..27a957e 100644 --- a/metadata/md5-cache/net-misc/openbgpd-9999 +++ b/metadata/md5-cache/net-misc/openbgpd-9999 @@ -8,5 +8,5 @@ LICENSE=ISC PROPERTIES=live RDEPEND=!!net-misc/frr acct-group/_bgpd acct-user/_bgpd SLOT=0 -_eclasses_=gnuconfig a397adda6984a4c423e28ac274c1ba98 toolchain-funcs 333970c740aa7b1a92e4fcdc52f612bd multilib c19072c3cd7ac5cb21de013f7e9832e0 libtool 5f49a16f67f81bdf873e3d1f10b10001 autotools d12ccbad07b44642a75ac97a3334d8e0 git-r3 875eb471682d3e1f18da124be97dcc81 systemd c8b03e8df84486aa991d4396686e8942 +_eclasses_=gnuconfig ddeb9f8caff1b5f71a09c75b7534df79 toolchain-funcs fa554cc3cff825d21dfe3f24841e29cf multilib b2a329026f2e404e9e371097dda47f96 libtool 6b28392a775f807c8be5fc7ec9a605b9 autotools 7d91cc798a8afd8f4e0c6e9587296ebe git-r3 875eb471682d3e1f18da124be97dcc81 systemd 54bd206bb5c4efac6ae28b6b006713b0 _md5_=014e5950f10828b313f69ca94ee17f51 diff --git a/net-misc/openbgpd/openbgpd-8.6.ebuild b/net-misc/openbgpd/openbgpd-8.6.ebuild index 7672136..c460ff3 100644 --- a/net-misc/openbgpd/openbgpd-8.6.ebuild +++ b/net-misc/openbgpd/openbgpd-8.6.ebuild @@ -30,6 +30,14 @@ BDEPEND=" dev-build/libtool " +src_configure() { + local myargs=( + --localstatedir="${EPREFIX}/var" + ) + + econf "${myargs[@]}" +} + src_install() { default diff --git a/net-misc/openbgpd/openbgpd-9999.ebuild b/net-misc/openbgpd/openbgpd-9999.ebuild deleted file mode 100644 index 5f336d0..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 - -DESCRIPTION="OpenBGPD is a free implementation of BGPv4" -HOMEPAGE="http://www.openbgpd.org/" -EGIT_REPO_URI="https://github.com/${PN}-portable/${PN}-portable.git" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="" -IUSE="" - -DEPEND="" -RDEPEND=" - ${DEPEND} - !!net-misc/frr - acct-group/_bgpd - acct-user/_bgpd -" -BDEPEND=" - dev-util/byacc - sys-devel/libtool -" - -PATCHES=( - "${FILESDIR}/${P}-update.patch" - "${FILESDIR}/${P}-config.c.patch" -) - -src_unpack() { - git-r3_src_unpack - - cd "${WORKDIR}" - - EGIT_REPO_URI="https://github.com/openbgpd-portable/openbgpd-openbsd.git" - EGIT_BRANCH=$(cat "${S}"/OPENBSD_BRANCH) - EGIT_CHECKOUT_DIR="${S}/openbsd" - git-r3_fetch - git-r3_checkout -} - -src_prepare() { - 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() { - 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 -}