diff options
Diffstat (limited to 'net-misc/exabgp')
| -rw-r--r-- | net-misc/exabgp/Manifest | 4 | ||||
| -rw-r--r-- | net-misc/exabgp/exabgp-4.2.21-r1.ebuild (renamed from net-misc/exabgp/exabgp-4.2.21.ebuild) | 10 | ||||
| -rw-r--r-- | net-misc/exabgp/files/exabgp-4.2.21-exabgp.service-to-fix-socket-creation-on-start.patch | 38 | ||||
| -rw-r--r-- | net-misc/exabgp/files/exabgp-4.2.21-patch-embedded-six-for-py312.patch | 52 |
4 files changed, 99 insertions, 5 deletions
diff --git a/net-misc/exabgp/Manifest b/net-misc/exabgp/Manifest index 4952f154d6c0..d5bf1d07ddf8 100644 --- a/net-misc/exabgp/Manifest +++ b/net-misc/exabgp/Manifest @@ -2,6 +2,8 @@ AUX exabgp-4.2.10-ip-path.patch 794 BLAKE2B 54a55550f928eaa3c3a64e3c7e19acff21b7 AUX exabgp-4.2.11-healthcheck-allow-disable-metric.patch 1200 BLAKE2B c3cbe40e36a89ebf777501aafabd6c0f855313a35792b057ee38321c5d58916f5caf8e8d037ade697f4fb55be8851d0b03087412cecb913be627267b703db49e SHA512 04a6e0cf857b28406408bf768f12acb3f1e71e224c9881ff0bedceea7ae8b54b502833db6b560754a5ff27c3c437127b8443d686becadff073dec0d97b9d49e8 AUX exabgp-4.2.11-healthcheck-fix-log-crash.patch 504 BLAKE2B ba1070bfd58e84748cdf54435f7c0d525cfa426f4ecc0e922ec61be81df75e735e1fda21f4aed42df51edec89c2a3502c2219f127c82d135bd1c03e9bd5b2b4e SHA512 59b794bb383e510b6ef4ab2aee8f40644982275079d83aff124f0769e7a88fe1f0b86c3b1df910f923f2cbbe602b0df5ce144813f06145cf669c1a90bcae7b5b AUX exabgp-4.2.11-less-verbose-logging.patch 2346 BLAKE2B 7a08fe4ac14622a69136a0456a7249d1a3ab08cd1fd07338ec05eedaff05ece565c5d86abaf24ab3147a248067f91d84982118e2713362c0648c2e8ade139a59 SHA512 2f76c8eb7b4fdd9ea39f896af6892a1b13a7357868e8a99803df295a9955149d09c6a25c17f2f0c50c435bcc320fccfe9b424f899b17d4c9a73ee359deabf6ff +AUX exabgp-4.2.21-exabgp.service-to-fix-socket-creation-on-start.patch 1192 BLAKE2B 9289e1619e73b27f333a9e070be767d2ac15406bba37b3aab7f89aff8334a6f429035ae1881ac5220e0c43792b5c8c911e09d36617808057327472a0bd2285e6 SHA512 d071f7cd238a58278996eb2fd52c197fcd11cd8b88eefb5da7652a0e157edc3484536e896603504cb086ac529d6d6fded49f5c9532bf4fc063e3e4ab6eea0778 +AUX exabgp-4.2.21-patch-embedded-six-for-py312.patch 1494 BLAKE2B da2d1f0988c030a64e85756778d427333beecb344cfe7de9dceccbf8ec6ca0c4ed7aed08b33cffdbc3997906e65b3d05c7e16ecb4848a1a2e1e67c72379a6cb9 SHA512 7a9f99a54ac4d757dc99532487cde4cd04dfb6e69b463d9ac967c3f9ad7dc4d4b3ec33b055c292ec012c110f66e9dadba95187286c9963515f9a302d5ad5a44c AUX exabgp-4.2.7-paths.patch 302 BLAKE2B 52110fefb75e0a36452ea3e53f099897b30df8287d033b353f66df25cf75c4a75a80e91ef49a47c652a46274faabfcf5385653ae03eb75ed1afd866c068967c7 SHA512 678258e4848b17b9880849cb8d105ee64b4cb6bdd678c3c96707467a2bae51c30d34b8609bf5c9a48bcd0722f6247b009dc5c406a3bab02d77bf2f919e7f4fbc AUX exabgp.confd 183 BLAKE2B 59338bbd61001e4418b970abc45786004b833f80576117122fec99f148c1bab3bc7feed80c46b8bac2ac639b720daa320bd141f65b25a37a6ce1f229653f3741 SHA512 7b888ea5053ebb8da9acbd4a85b6a9900663cadb89258aea86d47cade505e8bbfc6e741fed599d410480467f76f759175d710c284bc6caafdabb4a61c53611ac AUX exabgp.initd 1476 BLAKE2B a7b85715a05ac9a754157cf19efd9616fb356666bcdb3722e26ac22e92aef7a501641ac7690ff5b163d29a70ea993d2ebef6efb4eb2723ad8d0e417d6b40d2f6 SHA512 596009c03b39f7cb50bf6104202789c06ab98d387a4797006cd20f6cba49dbeb2fd9fb10ccacce29251f5540e587d7c7df1f545aa642dfbb91e818efb87166ff @@ -9,5 +11,5 @@ AUX exabgp.initd-r2 1615 BLAKE2B 2396103f84c871aaf090ab1546abc724c783a4051750fb1 AUX exabgp.logrotate 61 BLAKE2B 63024bebc07e3eadacf1550674f5fbb7cf22d903a02784d8d5f1aae3b8f6e543e5b4b2f7208af91b4c063cb68d831caf18c2b03fce211c4c447f3828c5c8127f SHA512 27e751f0ff066448fc0121a129a9c48ac645738f65041aa29816cddc80dc73f2458110ccd12fa48b2ccb573908357425070103303d5645987b2a4e74986a2786 AUX exabgp.tmpfiles 136 BLAKE2B 1255c9e510f9dc53b4e1b678ab8be2c7e88aac461789b15106ebf1e9606eb48ccd732efcc8ebfc8271efa5d0f6972705476a5f8c658480909b35ebf6eb399281 SHA512 3a11a011967f83483c85035ab63376bc92af3c3076ddbaac2e2cb3557aa314cfb188ee8e3208bfec7cb74d86a7b877c50487cbfa5f3097534cdbc7e98fc4b537 DIST exabgp-4.2.21.tar.gz 2933721 BLAKE2B 1d4b7cb6d053d2a9b8a338b6cf5f84d8d4ea2e1d1685cac8fb9b4b02cbdb8b9d5de41d4072d9379892e4bf89444f301f88243e5d5145d213956be7319861b723 SHA512 0efc7143191e8b557297e9329354c01e2418e0c4c45753941eba3a1f063e77d17a0efa7a14a3062764e45e709f0598f491c10e2c02e751590bb7c0943b61932b -EBUILD exabgp-4.2.21.ebuild 1422 BLAKE2B fb2dedf5e12caa00ba884edcbca3dccc5e8e32e52eaea2fe618205f819b367fc80cb561e9bab0a307f507d191261da3ca8ff95f6ace7921e6e7682f6195f2b26 SHA512 4e11658ea97be9601a546b0ec50117d24811514dae13e9325c5916eaacdff0ef90e19e1eb032d5485ea07281f36b15025bd0bc1084f2a9e0e5d7e8a08d50fb7d +EBUILD exabgp-4.2.21-r1.ebuild 1576 BLAKE2B 3adde3eb69eb047962dcfb5a60b7d0578373e50e0b61046a221621c6a799b444176d4dcc5e3ecd63067b997990870914a192f38d9e82d2f781347fe18f5db64c SHA512 82759cea6a83b24dd45a47f8b0242a59f63af6995171ac90277e50ff3651196a2146408f5ad7d5f27da189fe425a9d1b13493b06b8cfdc2202e3ec52de319bd4 MISC metadata.xml 344 BLAKE2B 20bfa14279184ddbcd77773d12fb120d9182b2eab6f5e99c044229efcad49de8861f50ac3560cf85d79aec6fa67c54fef8b1a3a5fffef7c2ae9c36d1eb134bb4 SHA512 f10156cff443ec23883c09dcf78b83d2ea44c9730214b9197e2efdc56f3df0b934ed6db5eed258c5ca89886ec13049f9ef904972043a602606cc2529e8912d19 diff --git a/net-misc/exabgp/exabgp-4.2.21.ebuild b/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 000000000000..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 <vincent@bernat.ch> +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 000000000000..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 <bernat@debian.org> +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(fullname, self) ++ return None ++ + def __get_module(self, fullname): + try: + return self.known_modules[fullname] +@@ -217,9 +227,13 @@ def get_code(self, fullname): + Required, if is_package is implemented""" + self.__get_module(fullname) # eventually raises ImportError + return None +- + get_source = get_code # same as get_code + ++ def create_module(self, spec): ++ return self.load_module(spec.name) ++ ++ def exec_module(self, module): ++ pass + + _importer = _SixMetaPathImporter(__name__) + |