[gentoo-commits] repo/gentoo:master commit in: net-misc/exabgp/files/, net-misc/exabgp/
commit: d720e4f889f86cc6d6344d72f934f10d5f1c1180
Author: Patrick McLean gentoo org>
AuthorDate: Tue Apr 23 23:14:06 2024 +
Commit: Patrick McLean gentoo org>
CommitDate: Tue Apr 23 23:14:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d720e4f8
net-misc/exabgp: Revbump, fix bugs #929723, #923160, #910006
Closes: https://bugs.gentoo.org/929723
Closes: https://bugs.gentoo.org/923160
Closes: https://bugs.gentoo.org/910006
Signed-off-by: Patrick McLean gentoo.org>
...xabgp-4.2.21.ebuild => exabgp-4.2.21-r1.ebuild} | 10 +++--
...p.service-to-fix-socket-creation-on-start.patch | 38
...xabgp-4.2.21-patch-embedded-six-for-py312.patch | 52 ++
3 files changed, 96 insertions(+), 4 deletions(-)
diff --git a/net-misc/exabgp/exabgp-4.2.21.ebuild
b/net-misc/exabgp/exabgp-4.2.21-r1.ebuild
similarity index 80%
rename from net-misc/exabgp/exabgp-4.2.21.ebuild
rename to net-misc/exabgp/exabgp-4.2.21-r1.ebuild
index 23eb5f34e950..40fa0522f040 100644
--- a/net-misc/exabgp/exabgp-4.2.21.ebuild
+++ b/net-misc/exabgp/exabgp-4.2.21-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=setuptools
inherit tmpfiles systemd distutils-r1
DESCRIPTION="The BGP swiss army knife of networking"
@@ -34,12 +34,14 @@ PATCHES=(
"${FILESDIR}/exabgp-4.2.11-healthcheck-allow-disable-metric.patch"
"${FILESDIR}/exabgp-4.2.11-healthcheck-fix-log-crash.patch"
"${FILESDIR}/exabgp-4.2.11-less-verbose-logging.patch"
+
"${FILESDIR}/exabgp-4.2.21-exabgp.service-to-fix-socket-creation-on-start.patch"
+ "${FILESDIR}/exabgp-4.2.21-patch-embedded-six-for-py312.patch"
)
distutils_enable_tests pytest
python_test() {
- ./qa/bin/parsing || die "tests fail with ${EPYTHON}"
+ ./qa/bin/parsing || die "parsing tests fail with ${EPYTHON}"
epytest
}
diff --git
a/net-misc/exabgp/files/exabgp-4.2.21-exabgp.service-to-fix-socket-creation-on-start.patch
b/net-misc/exabgp/files/exabgp-4.2.21-exabgp.service-to-fix-socket-creation-on-start.patch
new file mode 100644
index ..78d26f73f093
--- /dev/null
+++
b/net-misc/exabgp/files/exabgp-4.2.21-exabgp.service-to-fix-socket-creation-on-start.patch
@@ -0,0 +1,38 @@
+From: Vincent Bernat
+Date: Sun, 2 May 2021 17:47:10 +0200
+Subject: Patch exabgp.service to fix socket creation on start
+
+Patch from Marco d'Itri.
+
+Closes: #886568.
+---
+ etc/systemd/exabgp.service | 15 ++-
+ 1 file changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/etc/systemd/exabgp.service b/etc/systemd/exabgp.service
+index 17ce886..b2da5ba 100644
+--- a/etc/systemd/exabgp.service
b/etc/systemd/exabgp.service
+@@ -7,16 +7,13 @@ After=network.target
+ ConditionPathExists=/etc/exabgp/exabgp.conf
+
+ [Service]
+-#User=exabgp
+-#Group=exabgp
+ Environment=exabgp_daemon_daemonize=false
+-PermissionsStartOnly=true
+-ExecStartPre=-mkfifo /run/exabgp.in
+-ExecStartPre=-mkfifo /run/exabgp.out
+-ExecStartPre=chmod 600 /run/exabgp.in
+-ExecStartPre=chmod 600 /run/exabgp.out
+-ExecStartPre=chown exabgp.exabgp /run/exabgp.in
+-ExecStartPre=chown exabgp.exabgp /run/exabgp.out
++User=exabgp
++Group=exabgp
++RuntimeDirectory=exabgp
++RuntimeDirectoryMode=0750
++ExecStartPre=-/usr/bin/mkfifo /run/exabgp/exabgp.in
++ExecStartPre=-/usr/bin/mkfifo /run/exabgp/exabgp.out
+ ExecStart=/usr/sbin/exabgp /etc/exabgp/exabgp.conf
+ ExecReload=/bin/kill -USR1 $MAINPID
+ Restart=always
diff --git
a/net-misc/exabgp/files/exabgp-4.2.21-patch-embedded-six-for-py312.patch
b/net-misc/exabgp/files/exabgp-4.2.21-patch-embedded-six-for-py312.patch
new file mode 100644
index ..ccbf33021d87
--- /dev/null
+++ b/net-misc/exabgp/files/exabgp-4.2.21-patch-embedded-six-for-py312.patch
@@ -0,0 +1,52 @@
+From: Vincent Bernat
+Date: Mon, 1 Jan 2024 09:15:39 +0100
+Subject: Patch embedded six for Python 3.12
+
+Closes: #1058181
+---
+ lib/exabgp/vendoring/six.py | 16 +++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/lib/exabgp/vendoring/six.py b/lib/exabgp/vendoring/six.py
+index 20e866a..5f8f3b0 100644
+--- a/lib/exabgp/vendoring/six.py
b/lib/exabgp/vendoring/six.py
+@@ -71,6 +71,11 @@ def __len__(self):
+ MAXSIZE = int((1 << 63) - 1)
+ del X
+
++if PY34:
++from importlib.util import spec_from_loader
++else:
++spec_from_loader = None
++
+
+ def _add_doc(func, doc):
+ """Add documentation to a function."""
+@@ -182,6 +187,11 @@ def find_module(self, fullname, path=None):
+ return self
+ return None
+
++def find_spec(self, fullname, path, target=None):
++if fullname in self.known_modules:
++return spec_from_loader(fullna
[gentoo-commits] repo/gentoo:master commit in: net-misc/exabgp/files/, net-misc/exabgp/
commit: 6e73d50d48c225700837c41b30bcc53594aec5aa
Author: Patrick McLean sony com>
AuthorDate: Thu Feb 25 17:31:21 2021 +
Commit: Patrick McLean gentoo org>
CommitDate: Thu Feb 25 17:31:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e73d50d
net-misc/exabgp-4.2.11-r2: Revbump, supervision, misc bugfixes
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Patrick McLean gentoo.org>
net-misc/exabgp/exabgp-4.2.11-r2.ebuild| 59
...p-4.2.11-healthcheck-allow-disable-metric.patch | 22
.../exabgp-4.2.11-healthcheck-fix-log-crash.patch | 13 +
.../files/exabgp-4.2.11-less-verbose-logging.patch | 44 +++
net-misc/exabgp/files/exabgp.initd-r1 | 64 ++
5 files changed, 202 insertions(+)
diff --git a/net-misc/exabgp/exabgp-4.2.11-r2.ebuild
b/net-misc/exabgp/exabgp-4.2.11-r2.ebuild
new file mode 100644
index 000..3e7774c0353
--- /dev/null
+++ b/net-misc/exabgp/exabgp-4.2.11-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit tmpfiles systemd distutils-r1
+
+DESCRIPTION="The BGP swiss army knife of networking"
+HOMEPAGE="https://github.com/Exa-Networks/exabgp";
+SRC_URI="https://github.com/Exa-Networks/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ acct-group/exabgp
+ acct-user/exabgp
+"
+BDEPEND="
+ test? (
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/exabgp-4.2.7-paths.patch"
+ "${FILESDIR}/exabgp-4.2.10-ip-path.patch"
+ "${FILESDIR}/exabgp-4.2.11-healthcheck-allow-disable-metric.patch"
+ "${FILESDIR}/exabgp-4.2.11-healthcheck-fix-log-crash.patch"
+ "${FILESDIR}/exabgp-4.2.11-less-verbose-logging.patch"
+)
+
+python_test() {
+ ./qa/bin/parsing || die "tests fail with ${EPYTHON}"
+ nosetests -v ./qa/tests/*_test.py || die "tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+ newtmpfiles "${FILESDIR}/exabgp.tmpfiles" ${PN}.conf
+ systemd_dounit etc/systemd/*
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ keepdir /etc/exabgp
+
+ doman doc/man/*.?
+}
diff --git
a/net-misc/exabgp/files/exabgp-4.2.11-healthcheck-allow-disable-metric.patch
b/net-misc/exabgp/files/exabgp-4.2.11-healthcheck-allow-disable-metric.patch
new file mode 100644
index 000..768fe80a810
--- /dev/null
+++ b/net-misc/exabgp/files/exabgp-4.2.11-healthcheck-allow-disable-metric.patch
@@ -0,0 +1,22 @@
+diff --git a/lib/exabgp/application/healthcheck.py
b/lib/exabgp/application/healthcheck.py
+index a4f6b8d1..805cf8af 100644
+--- a/lib/exabgp/application/healthcheck.py
b/lib/exabgp/application/healthcheck.py
+@@ -168,6 +168,7 @@
+ g.add_argument(
+ "--start-ip", metavar='N', type=int, default=0, help="index of the
first IP in the list of IP addresses"
+ )
++g.add_argument("--no-metric", action="store_true", default=False,
help="don't send metrics when updating announcements")
+ g.add_argument(
+ "--up-metric", metavar='M', type=int, default=100, help="first IP get
the metric M when the service is up"
+ )
+@@ -494,7 +495,8 @@
+ announce = "route {0} next-hop {1}".format(str(ip),
options.next_hop or "self")
+
+ if command == "announce":
+-announce = "{0} med {1}".format(announce, metric)
++if not options.no_metric:
++announce = "{0} med {1}".format(announce, metric)
+ if options.local_preference >= 0:
+ announce = "{0} local-preference {1}".format(announce,
options.local_preference)
+ if options.community or options.disabled_community:
diff --git
a/net-misc/exabgp/files/exabgp-4.2.11-healthcheck-fix-log-crash.patch
b/net-misc/exabgp/files/exabgp-4.2.11-healthcheck-fix-log-crash.patch
new file mode 100644
index 000..a43e90a724e
--- /dev/null
+++ b/net-misc/exabgp/files/exabgp-4.2.11-healthcheck-fix-log-crash.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/exabgp/logger.py b/lib/exabgp/logger.py
+index 41a1cf28..f87785a2 100644
+--- a/lib/exabgp/logger.py
b/lib/exabgp/logger.py
+@@ -339,7 +339,7 @@ class Logger(object):
+ else:
+ src = source
+
+-log = self._option.get(src, True) and getattr(syslog, 'LOG_%s' %
level) <= self.level
++log = sel
[gentoo-commits] repo/gentoo:master commit in: net-misc/exabgp/files/, net-misc/exabgp/
commit: 4fcc63b780eb64f039754a7f5008bd1f52b1f0f0
Author: Patrick McLean sony com>
AuthorDate: Wed Nov 4 02:19:58 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Wed Nov 4 02:21:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fcc63b7
net-misc/exabgp-4.2.11: Version bump
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Patrick McLean gentoo.org>
net-misc/exabgp/Manifest| 2 +-
.../exabgp/{exabgp-4.2.7-r3.ebuild => exabgp-4.2.11.ebuild} | 4 ++--
net-misc/exabgp/files/exabgp-4.2.10-ip-path.patch | 13 +
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/net-misc/exabgp/Manifest b/net-misc/exabgp/Manifest
index 7ffb7202572..310718963b1 100644
--- a/net-misc/exabgp/Manifest
+++ b/net-misc/exabgp/Manifest
@@ -1 +1 @@
-DIST exabgp-4.2.7.tar.gz 2931058 BLAKE2B
2c7bf175322a36c800a8a5874b699b01f4c3d4a8712b1f8decb73665cd214c25ccf657909cfef74610e6a5fd1903245bc4da638ac9245b04c6e63d8247d72d50
SHA512
9c53b78e3fc5ff9cef4d267e2cb3509dbcfdd4a3b21d2c7e40a8d873a9ac586b8d5bf860699b6f878cc221af341df140acdf88aaa26a79b0e7865ce7cc607e01
+DIST exabgp-4.2.11.tar.gz 2931753 BLAKE2B
e5241619db24e2e82dfb42bc613d6b2c28efac205d2bedf732a665a5a9eff1b384833cb1fec3e68a285fc01269c2eaca55b311650e59bcda13d8f024e5294dc3
SHA512
61c143e90fd81323b03682ad46f2861576ab0328e2030259eff15bb9ef965477c514fb355112cbaf3dc138fb9f5582b6e1e1efb8d0d4313a9b9924ced156a155
diff --git a/net-misc/exabgp/exabgp-4.2.7-r3.ebuild
b/net-misc/exabgp/exabgp-4.2.11.ebuild
similarity index 93%
rename from net-misc/exabgp/exabgp-4.2.7-r3.ebuild
rename to net-misc/exabgp/exabgp-4.2.11.ebuild
index bdcff317c20..a8c1d2b70f6 100644
--- a/net-misc/exabgp/exabgp-4.2.7-r3.ebuild
+++ b/net-misc/exabgp/exabgp-4.2.11.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit tmpfiles systemd distutils-r1
@@ -19,7 +19,6 @@ RESTRICT="!test? ( test )"
RDEPEND="
acct-group/exabgp
acct-user/exabgp
- dev-python/ipaddr[${PYTHON_USEDEP}]
"
BDEPEND="
test? (
@@ -31,6 +30,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/exabgp-4.2.7-paths.patch"
+ "${FILESDIR}/exabgp-4.2.10-ip-path.patch"
)
python_test() {
diff --git a/net-misc/exabgp/files/exabgp-4.2.10-ip-path.patch
b/net-misc/exabgp/files/exabgp-4.2.10-ip-path.patch
new file mode 100644
index 000..0a86f72dd91
--- /dev/null
+++ b/net-misc/exabgp/files/exabgp-4.2.10-ip-path.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/exabgp/application/healthcheck.py
b/lib/exabgp/application/healthcheck.py
+index a4f6b8d1..2b4e928e 100644
+--- a/lib/exabgp/application/healthcheck.py
b/lib/exabgp/application/healthcheck.py
+@@ -184,7 +184,7 @@ def loopback_ips(label, label_only):
+ # Use "ip" (ifconfig is not able to see all addresses)
+ ipre = re.compile(r"^(?P\d+):\s+(?P\S+)\s+inet6?\s+"
r"(?P[\da-f.:]+)/(?P\d+)\s+.*")
+ labelre = re.compile(r".*\s+lo:(?P\S+).*")
+-cmd = subprocess.Popen("/sbin/ip -o address show dev lo".split(),
shell=False, stdout=subprocess.PIPE)
++cmd = subprocess.Popen("ip -o address show dev lo".split(),
shell=False, stdout=subprocess.PIPE)
+ else:
+ # Try with ifconfig
+ ipre = re.compile(
[gentoo-commits] repo/gentoo:master commit in: net-misc/exabgp/files/, net-misc/exabgp/
commit: 24343e7501aa0f96946fd9bc30740543b14620f2
Author: Patrick McLean gentoo org>
AuthorDate: Fri Jul 10 03:42:38 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Fri Jul 10 03:49:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24343e75
net-misc/exabgp-4.2.7-r3: Revbump, fix tmpfiles
Signed-off-by: Patrick McLean gentoo.org>
net-misc/exabgp/{exabgp-4.2.7-r2.ebuild => exabgp-4.2.7-r3.ebuild} | 0
net-misc/exabgp/files/exabgp.tmpfiles | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/exabgp/exabgp-4.2.7-r2.ebuild
b/net-misc/exabgp/exabgp-4.2.7-r3.ebuild
similarity index 100%
rename from net-misc/exabgp/exabgp-4.2.7-r2.ebuild
rename to net-misc/exabgp/exabgp-4.2.7-r3.ebuild
diff --git a/net-misc/exabgp/files/exabgp.tmpfiles
b/net-misc/exabgp/files/exabgp.tmpfiles
index 80720cbfc1f..513ccb06ba9 100644
--- a/net-misc/exabgp/files/exabgp.tmpfiles
+++ b/net-misc/exabgp/files/exabgp.tmpfiles
@@ -1,3 +1,3 @@
-f /run/exabgp 0755exabgp exabgp - -
+d /run/exabgp 0755exabgp exabgp - -
p /run/exabgp/exabgp.in 0600exabgp exabgp - -
p /run/exabgp/exabgp.out 0600exabgp exabgp - -
[gentoo-commits] repo/gentoo:master commit in: net-misc/exabgp/files/, net-misc/exabgp/
commit: cf95a138451d35566712e45ae763c0470ea2254e
Author: Patrick McLean sony com>
AuthorDate: Wed May 20 01:15:57 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Wed May 20 01:15:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf95a138
net-misc/exabgp: revbumps, add deps on user/group packages
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrick McLean gentoo.org>
net-misc/exabgp/{exabgp-3.4.28-r1.ebuild => exabgp-3.4.28-r2.ebuild} | 2 ++
net-misc/exabgp/{exabgp-4.2.7-r1.ebuild => exabgp-4.2.7-r2.ebuild} | 2 ++
net-misc/exabgp/files/exabgp.tmpfiles| 2 +-
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/net-misc/exabgp/exabgp-3.4.28-r1.ebuild
b/net-misc/exabgp/exabgp-3.4.28-r2.ebuild
similarity index 95%
rename from net-misc/exabgp/exabgp-3.4.28-r1.ebuild
rename to net-misc/exabgp/exabgp-3.4.28-r2.ebuild
index c61d012c7a5..f6753117ebc 100644
--- a/net-misc/exabgp/exabgp-3.4.28-r1.ebuild
+++ b/net-misc/exabgp/exabgp-3.4.28-r2.ebuild
@@ -15,6 +15,8 @@ SLOT="0"
KEYWORDS="~amd64"
RDEPEND="
+ acct-group/exabgp
+ acct-user/exabgp
dev-python/ipaddr[${PYTHON_USEDEP}]
"
diff --git a/net-misc/exabgp/exabgp-4.2.7-r1.ebuild
b/net-misc/exabgp/exabgp-4.2.7-r2.ebuild
similarity index 96%
rename from net-misc/exabgp/exabgp-4.2.7-r1.ebuild
rename to net-misc/exabgp/exabgp-4.2.7-r2.ebuild
index 8714af508f9..bdcff317c20 100644
--- a/net-misc/exabgp/exabgp-4.2.7-r1.ebuild
+++ b/net-misc/exabgp/exabgp-4.2.7-r2.ebuild
@@ -17,6 +17,8 @@ IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="
+ acct-group/exabgp
+ acct-user/exabgp
dev-python/ipaddr[${PYTHON_USEDEP}]
"
BDEPEND="
diff --git a/net-misc/exabgp/files/exabgp.tmpfiles
b/net-misc/exabgp/files/exabgp.tmpfiles
index 15836294400..80720cbfc1f 100644
--- a/net-misc/exabgp/files/exabgp.tmpfiles
+++ b/net-misc/exabgp/files/exabgp.tmpfiles
@@ -1,3 +1,3 @@
f /run/exabgp 0755exabgp exabgp - -
-p /run/exabgp//exabgp.in 0600exabgp exabgp - -
+p /run/exabgp/exabgp.in 0600exabgp exabgp - -
p /run/exabgp/exabgp.out 0600exabgp exabgp - -
