Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/prelude-manager/, app-admin/prelude-manager/files/
Date: Fri, 01 Jan 2021 00:35:50
Message-Id: 1609461341.b47d08965ea2509f77c312834352e3e19eee6b9f.mgorny@gentoo
1 commit: b47d08965ea2509f77c312834352e3e19eee6b9f
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 1 00:33:20 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 1 00:35:41 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b47d0896
7
8 app-admin/prelude-manager: Remove old (py3.6)
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 app-admin/prelude-manager/Manifest | 3 --
13 .../files/prelude-manager-3.0.0-conf.patch | 11 ----
14 .../files/prelude-manager-3.0.0-configure.patch | 57 --------------------
15 .../files/prelude-manager-3.0.0-run.patch | 13 -----
16 .../prelude-manager/prelude-manager-3.0.0.ebuild | 62 ----------------------
17 .../prelude-manager/prelude-manager-4.0.0.ebuild | 58 --------------------
18 .../prelude-manager/prelude-manager-4.1.1.ebuild | 61 ---------------------
19 7 files changed, 265 deletions(-)
20
21 diff --git a/app-admin/prelude-manager/Manifest b/app-admin/prelude-manager/Manifest
22 index 8da3f555ded..6082542b31c 100644
23 --- a/app-admin/prelude-manager/Manifest
24 +++ b/app-admin/prelude-manager/Manifest
25 @@ -1,5 +1,2 @@
26 -DIST prelude-manager-3.0.0.tar.gz 1286459 BLAKE2B 0909b0d7501909de51cd580b6ce22a66b1900a3b5b7376d3aeb4136bf41128ab766a025d69d33c414a9623dabb0de144e2f21190c3c3cccb9c067db359aab1bd SHA512 4c16a353495179265375686ce9592c8cd044b4255060b78286466bd25f9b38634233c95af058e1c0b81e1b574ec9ada5b2db92d6d1f5594dfcddce572fd0fd67
27 -DIST prelude-manager-4.0.0.tar.gz 1353116 BLAKE2B 20aaa28797a67fd310807735bb08f0c21c3bd95950598a86c45144ee2474785aef0c7d569732c817509ae8ae52ffce5f43f3c071931f2960578681f91a8c9504 SHA512 793ed37c71eb4884cbbb49b11c7388ee291a35252255458ceadb4ce10d1392e8bad423f95e31bff4550a9cf1d04139e43729352554fd847048b6c8d14f813a8a
28 -DIST prelude-manager-4.1.1.tar.gz 1415847 BLAKE2B 7cea7209a680a38cf597a9678f3ac9a31b00187e4597e1aeed91bbe57a55981279e8399ee8c90a044e40873e595ca648736fa79090420d9bcd72b82588f7bb5e SHA512 4e9d09b56eb7ec55144caa06a04e458bf0462d8c0064a34aac5aa0fb96a30fbefe5a4956185b606ec58fc410e4cbcac8721e521b3396303b3bff88808042a966
29 DIST prelude-manager-5.1.0.tar.gz 1510054 BLAKE2B 88ef666a76c58af1a8164c033b7e9c1ea869a18a66cb489d8c7fdbf1fa331006e7844aea4386ea3185902afd108af5eb1b46ee17686032de460d8c5b336fd658 SHA512 1f0e993f9bf684ec65a741db3cdaf537dc47bc2f77652a37c194db422dd5da2aa33b78d3ee454c78b28b44c022eacc7246ee99187b0b8779c12f3a67320d89a3
30 DIST prelude-manager-5.2.0.tar.gz 1564874 BLAKE2B cd00aca6a533cdb47e311c4a8eed17d514f39de3b1c5a4b334b8e8c8c2d318b36d1fc843bf36be0383da2ae5f4e41a936fc70ad92d5b55ab56e9a34c36fc1dae SHA512 49f8fd10c7f3c5c816e6bc49ce8d47abfe56b4b0a1d8a564774f67ef5f0e3058c62ef9c88ca709b1fe2961ed832269fe811ddf57d4118879fa561970561507d6
31
32 diff --git a/app-admin/prelude-manager/files/prelude-manager-3.0.0-conf.patch b/app-admin/prelude-manager/files/prelude-manager-3.0.0-conf.patch
33 deleted file mode 100644
34 index 246ce7d921e..00000000000
35 --- a/app-admin/prelude-manager/files/prelude-manager-3.0.0-conf.patch
36 +++ /dev/null
37 @@ -1,11 +0,0 @@
38 ---- a/prelude-manager.conf.in
39 -+++ b/prelude-manager.conf.in
40 -@@ -361,7 +361,7 @@
41 - # (same source, target and classification combination) every 2 minutes
42 - # to reporting plugins (eg. to the database).
43 - [thresholding]
44 --path = alert.classification.text, alert.source.node.address.address, alert.target.node.address.address
45 -+path = alert.classification.text, alert.source(0).node.address(0).address, alert.target(0).node.address(0).address
46 - limit = 120
47 - count = 100
48 - hook = reporting
49
50 diff --git a/app-admin/prelude-manager/files/prelude-manager-3.0.0-configure.patch b/app-admin/prelude-manager/files/prelude-manager-3.0.0-configure.patch
51 deleted file mode 100644
52 index bc1949f0151..00000000000
53 --- a/app-admin/prelude-manager/files/prelude-manager-3.0.0-configure.patch
54 +++ /dev/null
55 @@ -1,57 +0,0 @@
56 -When : when you try to use enable with libmaxmind, libpreludedb, xml, libwrap, they are not working
57 -Why : Needed if you want to use useflags
58 ---- a/configure.in
59 -+++ b/configure.in
60 -@@ -110,7 +110,10 @@
61 - dnl **************************************************
62 - LIBMAXMINDDB_MIN_VERSION=1.0.0
63 -
64 --PKG_CHECK_MODULES([LIBMAXMINDDB], [libmaxminddb >= $LIBMAXMINDDB_MIN_VERSION], enable_libmaxminddb=yes, enable_libmaxminddb=no)
65 -+AC_ARG_ENABLE(libmaxminddb, AC_HELP_STRING(--enable-libmaxminddb, Define whether libmaxminddb is available), , enable_libmaxminddb="yes")
66 -+if test x$enable_libmaxminddb = xyes; then
67 -+ PKG_CHECK_MODULES([LIBMAXMINDDB], [libmaxminddb >= $LIBMAXMINDDB_MIN_VERSION], enable_libmaxminddb=yes, enable_libmaxminddb=no)
68 -+fi
69 - if test x$enable_libmaxminddb = xyes; then
70 - AC_CHECK_HEADER(maxminddb.h, enable_libmaxminddb=yes, enable_libmaxminddb=no)
71 - fi
72 -@@ -126,11 +129,14 @@
73 - dnl * Check for libpreludedb *
74 - dnl **************************************************
75 -
76 --AM_PATH_LIBPRELUDEDB(3.0.0, enable_libpreludedb=yes, enable_libpreludedb=no, no)
77 --AM_CONDITIONAL(HAVE_LIBPRELUDEDB, test x$enable_libpreludedb = xyes)
78 -+AC_ARG_ENABLE(libpreludedb, AC_HELP_STRING(--enable-libpreludedb, Define whether libpreludedb is available), , enable_libpreludedb="yes")
79 -+if test x$enable_libpreludedb = xyes; then
80 -+ AM_PATH_LIBPRELUDEDB(3.0.0, enable_libpreludedb=yes, enable_libpreludedb=no, no)
81 -+fi
82 - if test x$enable_libpreludedb = xyes; then
83 - AC_DEFINE_UNQUOTED(HAVE_LIBPRELUDEDB, , Define whether libpreludedb is available)
84 - fi
85 -+AM_CONDITIONAL(HAVE_LIBPRELUDEDB, test x$enable_libpreludedb = xyes)
86 -
87 -
88 -
89 -@@ -138,7 +144,10 @@
90 - dnl * Check for the Libxml2 *
91 - dnl ********************************************************
92 -
93 --AM_PATH_XML2(, enable_xmlmod=yes, enable_xmlmod=no)
94 -+AC_ARG_ENABLE(xmlmod, AC_HELP_STRING(--enable-xmlmod, Enable XML), , enable_xmlmod="yes")
95 -+if test x$enable_xmlmod = xyes; then
96 -+ AM_PATH_XML2(, enable_xmlmod=yes, enable_xmlmod=no)
97 -+fi
98 - AM_CONDITIONAL(HAVE_XML2, test x$enable_xmlmod = xyes)
99 -
100 -
101 -@@ -147,9 +156,10 @@
102 - dnl * TCP WRAPPER CHECK *
103 - dnl **************************************************
104 -
105 -+AC_ARG_WITH(libwrap, AC_HELP_STRING(--with-libwrap, Compile in libwrap (tcp_wrappers) support.), , with_libwrap="yes")
106 - AC_ARG_WITH(libwrap-prefix, AC_HELP_STRING(--with-libwrap-prefix@<:@=PFX@:>@,
107 - Compile in libwrap (tcp_wrappers) support @<:@default=auto@:>@.),
108 -- libwrap_required=true, with_libwrap="yes")
109 -+ libwrap_required=true, )
110 -
111 - if test x$with_libwrap != xno; then
112 - LIBWRAP_INCLUDE="tcpd.h"
113
114 diff --git a/app-admin/prelude-manager/files/prelude-manager-3.0.0-run.patch b/app-admin/prelude-manager/files/prelude-manager-3.0.0-run.patch
115 deleted file mode 100644
116 index ef6d553a3d2..00000000000
117 --- a/app-admin/prelude-manager/files/prelude-manager-3.0.0-run.patch
118 +++ /dev/null
119 @@ -1,13 +0,0 @@
120 -When : everytime
121 -Why : since systemd, run dir has changed
122 ---- a/configure.in
123 -+++ b/configure.in
124 -@@ -304,7 +304,7 @@
125 -
126 - manager_failover_dir=$LOCALSTATEDIR/spool/prelude-manager/failover
127 - manager_scheduler_dir=$LOCALSTATEDIR/spool/prelude-manager/scheduler
128 --manager_run_dir=$LOCALSTATEDIR/run/prelude-manager
129 -+manager_run_dir=/run/prelude-manager
130 -
131 - AC_DEFINE_UNQUOTED(REPORT_PLUGIN_DIR, "$report_plugin_dir", Prelude-Manager report plugin directory)
132 - AC_DEFINE_UNQUOTED(DECODE_PLUGIN_DIR, "$decode_plugin_dir", Prelude-Manager decode plugin directory)
133
134 diff --git a/app-admin/prelude-manager/prelude-manager-3.0.0.ebuild b/app-admin/prelude-manager/prelude-manager-3.0.0.ebuild
135 deleted file mode 100644
136 index 50497ad005f..00000000000
137 --- a/app-admin/prelude-manager/prelude-manager-3.0.0.ebuild
138 +++ /dev/null
139 @@ -1,62 +0,0 @@
140 -# Copyright 1999-2020 Gentoo Authors
141 -# Distributed under the terms of the GNU General Public License v2
142 -
143 -EAPI=6
144 -
145 -inherit autotools eutils ltprune systemd
146 -
147 -DESCRIPTION="Bus communication for all Prelude modules"
148 -HOMEPAGE="https://www.prelude-siem.org"
149 -SRC_URI="https://www.prelude-siem.org/pkg/src/3.0.0/${P}.tar.gz"
150 -
151 -LICENSE="GPL-2+"
152 -SLOT="0"
153 -KEYWORDS="~amd64 ~x86"
154 -IUSE="tcpwrapper xml geoip dbx"
155 -
156 -RDEPEND="net-libs/gnutls
157 - dev-libs/libprelude
158 - dbx? ( dev-libs/libpreludedb )
159 - tcpwrapper? ( sys-apps/tcp-wrappers )
160 - xml? ( dev-libs/libxml2 )
161 - geoip? ( dev-libs/libmaxminddb )"
162 -
163 -DEPEND="${RDEPEND}
164 - virtual/pkgconfig"
165 -
166 -PATCHES=(
167 - "${FILESDIR}/${P}-conf.patch"
168 - "${FILESDIR}/${P}-configure.patch"
169 - "${FILESDIR}/${P}-run.patch"
170 -)
171 -
172 -src_prepare() {
173 - default_src_prepare
174 -
175 - mv "${S}/configure.in" "${S}/configure.ac" || die "mv failed"
176 -
177 - eautoreconf
178 -}
179 -
180 -src_configure() {
181 - econf \
182 - --localstatedir=/var \
183 - $(use_enable dbx libpreludedb) \
184 - $(use_with tcpwrapper libwrap) \
185 - $(use_enable xml xmlmod) \
186 - $(use_enable geoip libmaxminddb)
187 -}
188 -
189 -src_install() {
190 - default_src_install
191 -
192 - rm -rv "${D}/run" || die "rm failed"
193 - keepdir /var/spool/prelude-manager{,/failover,/scheduler}
194 -
195 - prune_libtool_files --modules
196 -
197 - systemd_dounit "${FILESDIR}/${PN}.service"
198 - systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
199 -
200 - newinitd "${FILESDIR}/${PN}.initd" "${PN}"
201 -}
202
203 diff --git a/app-admin/prelude-manager/prelude-manager-4.0.0.ebuild b/app-admin/prelude-manager/prelude-manager-4.0.0.ebuild
204 deleted file mode 100644
205 index 30855a48ed9..00000000000
206 --- a/app-admin/prelude-manager/prelude-manager-4.0.0.ebuild
207 +++ /dev/null
208 @@ -1,58 +0,0 @@
209 -# Copyright 1999-2017 Gentoo Foundation
210 -# Distributed under the terms of the GNU General Public License v2
211 -
212 -EAPI=6
213 -
214 -inherit autotools systemd
215 -
216 -DESCRIPTION="Bus communication for all Prelude modules"
217 -HOMEPAGE="https://www.prelude-siem.org"
218 -SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
219 -
220 -LICENSE="GPL-2+"
221 -SLOT="0"
222 -KEYWORDS="~amd64 ~x86"
223 -IUSE="dbx geoip tcpwrapper xml"
224 -
225 -RDEPEND="net-libs/gnutls:=
226 - ~dev-libs/libprelude-${PV}
227 - dbx? ( ~dev-libs/libpreludedb-${PV} )
228 - geoip? ( dev-libs/libmaxminddb )
229 - tcpwrapper? ( sys-apps/tcp-wrappers )
230 - xml? ( dev-libs/libxml2 )"
231 -
232 -DEPEND="${RDEPEND}
233 - virtual/pkgconfig"
234 -
235 -PATCHES=(
236 - "${FILESDIR}/${PN}-3.1.0-run.patch"
237 -)
238 -
239 -src_prepare() {
240 - default
241 -
242 - eautoreconf
243 -}
244 -
245 -src_configure() {
246 - econf \
247 - --localstatedir="${EPREFIX}/var" \
248 - $(use_with dbx libpreludedb-prefix) \
249 - $(use_enable geoip libmaxminddb) \
250 - $(use_with tcpwrapper libwrap) \
251 - $(usex xml '' '--without-xml-prefix')
252 -}
253 -
254 -src_install() {
255 - default
256 -
257 - rm -rv "${ED%/}/run" || die "rm failed"
258 - keepdir /var/spool/prelude-manager{,/failover,/scheduler}
259 -
260 - find "${D}" -name '*.la' -delete || die
261 -
262 - systemd_dounit "${FILESDIR}/${PN}.service"
263 - systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
264 -
265 - newinitd "${FILESDIR}/${PN}.initd" "${PN}"
266 -}
267
268 diff --git a/app-admin/prelude-manager/prelude-manager-4.1.1.ebuild b/app-admin/prelude-manager/prelude-manager-4.1.1.ebuild
269 deleted file mode 100644
270 index 58cb583e19a..00000000000
271 --- a/app-admin/prelude-manager/prelude-manager-4.1.1.ebuild
272 +++ /dev/null
273 @@ -1,61 +0,0 @@
274 -# Copyright 1999-2018 Gentoo Foundation
275 -# Distributed under the terms of the GNU General Public License v2
276 -
277 -EAPI=6
278 -
279 -inherit autotools systemd
280 -
281 -DESCRIPTION="Bus communication for all Prelude modules"
282 -HOMEPAGE="https://www.prelude-siem.org"
283 -SRC_URI="https://www.prelude-siem.org/pkg/src/4.1.0/${P}.tar.gz"
284 -
285 -LICENSE="GPL-2+"
286 -SLOT="0"
287 -KEYWORDS="~amd64 ~x86"
288 -IUSE="dbx geoip tcpwrapper xml"
289 -
290 -RDEPEND="net-libs/gnutls:=
291 - ~dev-libs/libprelude-4.1.0
292 - dbx? ( ~dev-libs/libpreludedb-4.1.0 )
293 - geoip? ( dev-libs/libmaxminddb )
294 - tcpwrapper? ( sys-apps/tcp-wrappers )
295 - xml? ( dev-libs/libxml2 )"
296 -
297 -DEPEND="${RDEPEND}
298 - virtual/pkgconfig"
299 -
300 -PATCHES=(
301 - "${FILESDIR}/${PN}-3.1.0-run.patch"
302 -)
303 -
304 -src_prepare() {
305 - default
306 -
307 - eautoreconf
308 -}
309 -
310 -src_configure() {
311 - local myconf=(
312 - --localstatedir="${EPREFIX}/var"
313 - $(use_with dbx libpreludedb-prefix)
314 - $(use_enable geoip libmaxminddb)
315 - $(use_with tcpwrapper libwrap)
316 - $(usex xml '' '--without-xml-prefix')
317 - )
318 -
319 - econf "${myconf[@]}"
320 -}
321 -
322 -src_install() {
323 - default
324 -
325 - rm -rv "${ED%/}/run" || die "rm failed"
326 - keepdir /var/spool/prelude-manager{,/failover,/scheduler}
327 -
328 - find "${D}" -name '*.la' -delete || die
329 -
330 - systemd_dounit "${FILESDIR}/${PN}.service"
331 - systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
332 -
333 - newinitd "${FILESDIR}/${PN}.initd" "${PN}"
334 -}
Report Message
Find on MARC Find on Google Groups