1 |
commit: 7929e22bd5d58b1b119d20008aa6823a9ce0fd3b |
2 |
Author: Thomas Andrejak <thomas.andrejak <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat May 19 16:34:08 2018 +0000 |
4 |
Commit: Tony Vroon <chainsaw <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 18 07:31:50 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7929e22b |
7 |
|
8 |
net-analyzer/prelude-correlator: Bump version 4.1 |
9 |
|
10 |
net-analyzer/prelude-correlator/Manifest | 1 + |
11 |
.../prelude-correlator-4.1.1-fix_python3.patch | 36 ++++++++++++++++++++++ |
12 |
.../prelude-correlator-4.1.1.ebuild | 33 ++++++++++++++++++++ |
13 |
3 files changed, 70 insertions(+) |
14 |
|
15 |
diff --git a/net-analyzer/prelude-correlator/Manifest b/net-analyzer/prelude-correlator/Manifest |
16 |
index 49337bbb73d..58c9e31c5b8 100644 |
17 |
--- a/net-analyzer/prelude-correlator/Manifest |
18 |
+++ b/net-analyzer/prelude-correlator/Manifest |
19 |
@@ -1,3 +1,4 @@ |
20 |
DIST prelude-correlator-3.0.1.tar.gz 181019 BLAKE2B 9156b7c76ac641326dcbb6e89f336ad1a65ed9c0af3b32acaa2d4430d3ba0b5015b5baf6372bdeb8e08d269b7742304f84ac026c512b63ca8710cc757697d0c6 SHA512 2aa159251cf7f9fead117737f67cc01e7cb2012c4fd9db77454c7d639cf477888d5ea6476661bf501c2da7aaef58ea7101b7780669f025af1480acd9480ce8d3 |
21 |
DIST prelude-correlator-3.1.0.tar.gz 185812 BLAKE2B 8390059cf00f1f4038d31eff401d4a2e475f9ef89fe84b4748c891ccf521fa6c6d241e4e441d6398a2acaf2bf01451e4407188e95779f8c0dbb19713c405cc6d SHA512 f44d805445c19af1f80f2662b7c5d2678e9928fd5cea17e1938a712157ca3ac51eaf361bd164ec6fa38836461b3719cf739232c130f3c784cf692e1588256d79 |
22 |
DIST prelude-correlator-4.0.0.tar.gz 347973 BLAKE2B 93f383d5d3ca3632f841b8523efa829f00ee36e4fdce76c982ef638f468dc574fa69452b4e9e5abcdaec87697a4a824faf543f0383756d15a72e99c0ac02cabe SHA512 aeeb5d1e29a464afa41b8a04f5324e0915b8450eceea68a07cb6d8bb61823ab8da8df51e1a331f5a66fd295bd2a514f484da5c396e0508c4fc5634c98382779b |
23 |
+DIST prelude-correlator-4.1.1.tar.gz 237036 BLAKE2B f3965b179d101450bd5b64805d0c982cc093de47fbbc4b4e0077f231cffcf152f3ace78cab5e96d7e18d8af0fae7de0fb5c70c17b8888245558ab091bee6438d SHA512 ac6eb554ab8d20325afbe49fcec9e238d84579cb68ee5731e6ec7d1da11c1b745e60117fade76d8747c93f57d4ae91461fd6e82160f659f88a0bb545e4990597 |
24 |
|
25 |
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 |
26 |
new file mode 100644 |
27 |
index 00000000000..a671aa47658 |
28 |
--- /dev/null |
29 |
+++ b/net-analyzer/prelude-correlator/files/prelude-correlator-4.1.1-fix_python3.patch |
30 |
@@ -0,0 +1,36 @@ |
31 |
+--- a/preludecorrelator/config.py |
32 |
++++ b/preludecorrelator/config.py |
33 |
+@@ -19,7 +19,11 @@ |
34 |
+ |
35 |
+ import os |
36 |
+ import glob |
37 |
+-import StringIO |
38 |
++import sys |
39 |
++if sys.version_info >= (3, 0): |
40 |
++ from io import StringIO |
41 |
++else: |
42 |
++ import StringIO |
43 |
+ try: |
44 |
+ import configparser |
45 |
+ except: |
46 |
+@@ -77,5 +81,8 @@ |
47 |
+ f = open(fname, 'r') |
48 |
+ except IOError: |
49 |
+ continue |
50 |
+- self.readfp(StringIO.StringIO('[prelude]\n' + f.read())) |
51 |
++ if sys.version_info >= (3, 0): |
52 |
++ self.readfp(StringIO('[prelude]\n' + f.read())) |
53 |
++ else: |
54 |
++ self.readfp(StringIO.StringIO('[prelude]\n' + f.read())) |
55 |
+ f.close() |
56 |
+--- a/preludecorrelator/context.py |
57 |
++++ b/preludecorrelator/context.py |
58 |
+@@ -362,7 +362,7 @@ |
59 |
+ |
60 |
+ try: |
61 |
+ _CONTEXT_TABLE.update(ContextUnpickler(fd).load()) |
62 |
+- except EOFError: |
63 |
++ except: |
64 |
+ return |
65 |
+ |
66 |
+ logger.debug("[load]: %d context loaded", len(_CONTEXT_TABLE)) |
67 |
|
68 |
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild |
69 |
new file mode 100644 |
70 |
index 00000000000..1ff9d4c41e2 |
71 |
--- /dev/null |
72 |
+++ b/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild |
73 |
@@ -0,0 +1,33 @@ |
74 |
+# Copyright 1999-2018 Gentoo Foundation |
75 |
+# Distributed under the terms of the GNU General Public License v2 |
76 |
+ |
77 |
+EAPI=6 |
78 |
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) |
79 |
+ |
80 |
+inherit distutils-r1 systemd |
81 |
+ |
82 |
+DESCRIPTION="Real time correlator of events received by Prelude Manager" |
83 |
+HOMEPAGE="https://www.prelude-siem.org" |
84 |
+SRC_URI="https://www.prelude-siem.org/pkg/src/4.1.0/${P}.tar.gz" |
85 |
+ |
86 |
+LICENSE="GPL-2+" |
87 |
+SLOT="0" |
88 |
+KEYWORDS="~amd64 ~x86" |
89 |
+ |
90 |
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" |
91 |
+ |
92 |
+RDEPEND="~dev-libs/libprelude-4.1.0[python,${PYTHON_USEDEP}] |
93 |
+ dev-python/netaddr[${PYTHON_USEDEP}]" |
94 |
+ |
95 |
+PATCHES=( |
96 |
+ "${FILESDIR}/${PN}-4.1.1-fix_python3.patch" |
97 |
+) |
98 |
+ |
99 |
+src_install() { |
100 |
+ distutils-r1_src_install |
101 |
+ |
102 |
+ systemd_dounit "${FILESDIR}/${PN}.service" |
103 |
+ systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf" |
104 |
+ |
105 |
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}" |
106 |
+} |