commit: 85c5d439e079b7cd070a5bd3dd8464d465d0747a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 1 00:32:22 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 1 00:35:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85c5d439
net-analyzer/prelude-correlator: Remove old (py3.6)
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
net-analyzer/prelude-correlator/Manifest | 2 --
.../prelude-correlator-4.1.1-fix_python3.patch | 36 ----------------------
.../prelude-correlator-4.0.0.ebuild | 29 -----------------
.../prelude-correlator-4.1.1.ebuild | 33 --------------------
4 files changed, 100 deletions(-)
diff --git a/net-analyzer/prelude-correlator/Manifest
b/net-analyzer/prelude-correlator/Manifest
index 594d7b644cf..064bcdfec7c 100644
--- a/net-analyzer/prelude-correlator/Manifest
+++ b/net-analyzer/prelude-correlator/Manifest
@@ -1,4 +1,2 @@
-DIST prelude-correlator-4.0.0.tar.gz 347973 BLAKE2B
93f383d5d3ca3632f841b8523efa829f00ee36e4fdce76c982ef638f468dc574fa69452b4e9e5abcdaec87697a4a824faf543f0383756d15a72e99c0ac02cabe
SHA512
aeeb5d1e29a464afa41b8a04f5324e0915b8450eceea68a07cb6d8bb61823ab8da8df51e1a331f5a66fd295bd2a514f484da5c396e0508c4fc5634c98382779b
-DIST prelude-correlator-4.1.1.tar.gz 237036 BLAKE2B
f3965b179d101450bd5b64805d0c982cc093de47fbbc4b4e0077f231cffcf152f3ace78cab5e96d7e18d8af0fae7de0fb5c70c17b8888245558ab091bee6438d
SHA512
ac6eb554ab8d20325afbe49fcec9e238d84579cb68ee5731e6ec7d1da11c1b745e60117fade76d8747c93f57d4ae91461fd6e82160f659f88a0bb545e4990597
DIST prelude-correlator-5.1.0.tar.gz 242620 BLAKE2B
70d4c4cc620fe4aa605812a83979b097e78ea97c5684d0d7ac8f0de2975f68d54f712f0d6dcd341f2928c846663fdf5182f8481fe6142de7648ba8fd2443d369
SHA512
db3a4cb1c4a8254270f63552ee2a959bc28cec8fdb48340f1c301fa65df73115292060067bed4b5945da4717a216313aa6eb2525bc02de4a6a45716b9827f5fd
DIST prelude-correlator-5.2.0.tar.gz 216556 BLAKE2B
9ccdbaf01224d34a507191521aeda8a8fe91004dc0b7a6113cbfc4b0d7ebab345a160b0e498b3c3477e3cc52cda1501d11a558842bb286444a925463a66ff7b5
SHA512
96e0c7637f3d17dc7cd76603e95f29eba0a1ec86ae603dcb6900b26a12e410e62884f9e339a228e3dd4a0db0fd0e8849bbd098caeb7e3c15db917ed33ebb5b43
diff --git
a/net-analyzer/prelude-correlator/files/prelude-correlator-4.1.1-fix_python3.patch
b/net-analyzer/prelude-correlator/files/prelude-correlator-4.1.1-fix_python3.patch
deleted file mode 100644
index a671aa47658..00000000000
---
a/net-analyzer/prelude-correlator/files/prelude-correlator-4.1.1-fix_python3.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/preludecorrelator/config.py
-+++ b/preludecorrelator/config.py
-@@ -19,7 +19,11 @@
-
- import os
- import glob
--import StringIO
-+import sys
-+if sys.version_info >= (3, 0):
-+ from io import StringIO
-+else:
-+ import StringIO
- try:
- import configparser
- except:
-@@ -77,5 +81,8 @@
- f = open(fname, 'r')
- except IOError:
- continue
-- self.readfp(StringIO.StringIO('[prelude]\n' + f.read()))
-+ if sys.version_info >= (3, 0):
-+ self.readfp(StringIO('[prelude]\n' + f.read()))
-+ else:
-+ self.readfp(StringIO.StringIO('[prelude]\n' + f.read()))
- f.close()
---- a/preludecorrelator/context.py
-+++ b/preludecorrelator/context.py
-@@ -362,7 +362,7 @@
-
- try:
- _CONTEXT_TABLE.update(ContextUnpickler(fd).load())
-- except EOFError:
-+ except:
- return
-
- logger.debug("[load]: %d context loaded", len(_CONTEXT_TABLE))
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild
b/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild
deleted file mode 100644
index 147c825eb4c..00000000000
--- a/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Real time correlator of events received by Prelude Manager"
-HOMEPAGE="https://www.prelude-siem.org";
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz";
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="~dev-libs/libprelude-${PV}[python,${PYTHON_USEDEP}]
- dev-python/netaddr[${PYTHON_USEDEP}]"
-
-src_install() {
- distutils-r1_src_install
-
- systemd_dounit "${FILESDIR}/${PN}.service"
- systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
-
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-}
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild
b/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild
deleted file mode 100644
index 384e4b199c8..00000000000
--- a/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Real time correlator of events received by Prelude Manager"
-HOMEPAGE="https://www.prelude-siem.org";
-SRC_URI="https://www.prelude-siem.org/pkg/src/4.1.0/${P}.tar.gz";
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="~dev-libs/libprelude-4.1.0[python,${PYTHON_USEDEP}]
- dev-python/netaddr[${PYTHON_USEDEP}]"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.1.1-fix_python3.patch"
-)
-
-src_install() {
- distutils-r1_src_install
-
- systemd_dounit "${FILESDIR}/${PN}.service"
- systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
-
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-}
