1 |
commit: 85c5d439e079b7cd070a5bd3dd8464d465d0747a |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 1 00:32:22 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 1 00:35:40 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85c5d439 |
7 |
|
8 |
net-analyzer/prelude-correlator: Remove old (py3.6) |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
net-analyzer/prelude-correlator/Manifest | 2 -- |
13 |
.../prelude-correlator-4.1.1-fix_python3.patch | 36 ---------------------- |
14 |
.../prelude-correlator-4.0.0.ebuild | 29 ----------------- |
15 |
.../prelude-correlator-4.1.1.ebuild | 33 -------------------- |
16 |
4 files changed, 100 deletions(-) |
17 |
|
18 |
diff --git a/net-analyzer/prelude-correlator/Manifest b/net-analyzer/prelude-correlator/Manifest |
19 |
index 594d7b644cf..064bcdfec7c 100644 |
20 |
--- a/net-analyzer/prelude-correlator/Manifest |
21 |
+++ b/net-analyzer/prelude-correlator/Manifest |
22 |
@@ -1,4 +1,2 @@ |
23 |
-DIST prelude-correlator-4.0.0.tar.gz 347973 BLAKE2B 93f383d5d3ca3632f841b8523efa829f00ee36e4fdce76c982ef638f468dc574fa69452b4e9e5abcdaec87697a4a824faf543f0383756d15a72e99c0ac02cabe SHA512 aeeb5d1e29a464afa41b8a04f5324e0915b8450eceea68a07cb6d8bb61823ab8da8df51e1a331f5a66fd295bd2a514f484da5c396e0508c4fc5634c98382779b |
24 |
-DIST prelude-correlator-4.1.1.tar.gz 237036 BLAKE2B f3965b179d101450bd5b64805d0c982cc093de47fbbc4b4e0077f231cffcf152f3ace78cab5e96d7e18d8af0fae7de0fb5c70c17b8888245558ab091bee6438d SHA512 ac6eb554ab8d20325afbe49fcec9e238d84579cb68ee5731e6ec7d1da11c1b745e60117fade76d8747c93f57d4ae91461fd6e82160f659f88a0bb545e4990597 |
25 |
DIST prelude-correlator-5.1.0.tar.gz 242620 BLAKE2B 70d4c4cc620fe4aa605812a83979b097e78ea97c5684d0d7ac8f0de2975f68d54f712f0d6dcd341f2928c846663fdf5182f8481fe6142de7648ba8fd2443d369 SHA512 db3a4cb1c4a8254270f63552ee2a959bc28cec8fdb48340f1c301fa65df73115292060067bed4b5945da4717a216313aa6eb2525bc02de4a6a45716b9827f5fd |
26 |
DIST prelude-correlator-5.2.0.tar.gz 216556 BLAKE2B 9ccdbaf01224d34a507191521aeda8a8fe91004dc0b7a6113cbfc4b0d7ebab345a160b0e498b3c3477e3cc52cda1501d11a558842bb286444a925463a66ff7b5 SHA512 96e0c7637f3d17dc7cd76603e95f29eba0a1ec86ae603dcb6900b26a12e410e62884f9e339a228e3dd4a0db0fd0e8849bbd098caeb7e3c15db917ed33ebb5b43 |
27 |
|
28 |
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 |
29 |
deleted file mode 100644 |
30 |
index a671aa47658..00000000000 |
31 |
--- a/net-analyzer/prelude-correlator/files/prelude-correlator-4.1.1-fix_python3.patch |
32 |
+++ /dev/null |
33 |
@@ -1,36 +0,0 @@ |
34 |
---- a/preludecorrelator/config.py |
35 |
-+++ b/preludecorrelator/config.py |
36 |
-@@ -19,7 +19,11 @@ |
37 |
- |
38 |
- import os |
39 |
- import glob |
40 |
--import StringIO |
41 |
-+import sys |
42 |
-+if sys.version_info >= (3, 0): |
43 |
-+ from io import StringIO |
44 |
-+else: |
45 |
-+ import StringIO |
46 |
- try: |
47 |
- import configparser |
48 |
- except: |
49 |
-@@ -77,5 +81,8 @@ |
50 |
- f = open(fname, 'r') |
51 |
- except IOError: |
52 |
- continue |
53 |
-- self.readfp(StringIO.StringIO('[prelude]\n' + f.read())) |
54 |
-+ if sys.version_info >= (3, 0): |
55 |
-+ self.readfp(StringIO('[prelude]\n' + f.read())) |
56 |
-+ else: |
57 |
-+ self.readfp(StringIO.StringIO('[prelude]\n' + f.read())) |
58 |
- f.close() |
59 |
---- a/preludecorrelator/context.py |
60 |
-+++ b/preludecorrelator/context.py |
61 |
-@@ -362,7 +362,7 @@ |
62 |
- |
63 |
- try: |
64 |
- _CONTEXT_TABLE.update(ContextUnpickler(fd).load()) |
65 |
-- except EOFError: |
66 |
-+ except: |
67 |
- return |
68 |
- |
69 |
- logger.debug("[load]: %d context loaded", len(_CONTEXT_TABLE)) |
70 |
|
71 |
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild |
72 |
deleted file mode 100644 |
73 |
index 147c825eb4c..00000000000 |
74 |
--- a/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild |
75 |
+++ /dev/null |
76 |
@@ -1,29 +0,0 @@ |
77 |
-# Copyright 1999-2020 Gentoo Authors |
78 |
-# Distributed under the terms of the GNU General Public License v2 |
79 |
- |
80 |
-EAPI=6 |
81 |
-PYTHON_COMPAT=( python3_6 ) |
82 |
- |
83 |
-inherit distutils-r1 systemd |
84 |
- |
85 |
-DESCRIPTION="Real time correlator of events received by Prelude Manager" |
86 |
-HOMEPAGE="https://www.prelude-siem.org" |
87 |
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz" |
88 |
- |
89 |
-LICENSE="GPL-2+" |
90 |
-SLOT="0" |
91 |
-KEYWORDS="~amd64 ~x86" |
92 |
- |
93 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" |
94 |
- |
95 |
-RDEPEND="~dev-libs/libprelude-${PV}[python,${PYTHON_USEDEP}] |
96 |
- dev-python/netaddr[${PYTHON_USEDEP}]" |
97 |
- |
98 |
-src_install() { |
99 |
- distutils-r1_src_install |
100 |
- |
101 |
- systemd_dounit "${FILESDIR}/${PN}.service" |
102 |
- systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf" |
103 |
- |
104 |
- newinitd "${FILESDIR}/${PN}.initd" "${PN}" |
105 |
-} |
106 |
|
107 |
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild |
108 |
deleted file mode 100644 |
109 |
index 384e4b199c8..00000000000 |
110 |
--- a/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild |
111 |
+++ /dev/null |
112 |
@@ -1,33 +0,0 @@ |
113 |
-# Copyright 1999-2020 Gentoo Authors |
114 |
-# Distributed under the terms of the GNU General Public License v2 |
115 |
- |
116 |
-EAPI=6 |
117 |
-PYTHON_COMPAT=( python3_6 ) |
118 |
- |
119 |
-inherit distutils-r1 systemd |
120 |
- |
121 |
-DESCRIPTION="Real time correlator of events received by Prelude Manager" |
122 |
-HOMEPAGE="https://www.prelude-siem.org" |
123 |
-SRC_URI="https://www.prelude-siem.org/pkg/src/4.1.0/${P}.tar.gz" |
124 |
- |
125 |
-LICENSE="GPL-2+" |
126 |
-SLOT="0" |
127 |
-KEYWORDS="~amd64 ~x86" |
128 |
- |
129 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" |
130 |
- |
131 |
-RDEPEND="~dev-libs/libprelude-4.1.0[python,${PYTHON_USEDEP}] |
132 |
- dev-python/netaddr[${PYTHON_USEDEP}]" |
133 |
- |
134 |
-PATCHES=( |
135 |
- "${FILESDIR}/${PN}-4.1.1-fix_python3.patch" |
136 |
-) |
137 |
- |
138 |
-src_install() { |
139 |
- distutils-r1_src_install |
140 |
- |
141 |
- systemd_dounit "${FILESDIR}/${PN}.service" |
142 |
- systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf" |
143 |
- |
144 |
- newinitd "${FILESDIR}/${PN}.initd" "${PN}" |
145 |
-} |