Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/fail2ban/files/, net-analyzer/fail2ban/
Date: Wed, 29 Mar 2017 03:22:56
Message-Id: 1490757731.33ec5da48ff4577598c8e45b44024376c70f7ca0.jer@gentoo
1 commit: 33ec5da48ff4577598c8e45b44024376c70f7ca0
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 29 03:22:11 2017 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 29 03:22:11 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33ec5da4
7
8 net-analyzer/fail2ban: Old.
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.2
11
12 net-analyzer/fail2ban/Manifest | 3 -
13 net-analyzer/fail2ban/fail2ban-0.9.3-r1.ebuild | 108 ---------------------
14 net-analyzer/fail2ban/fail2ban-0.9.4.ebuild | 102 -------------------
15 net-analyzer/fail2ban/fail2ban-0.9.5.ebuild | 104 --------------------
16 .../fail2ban/files/fail2ban-0.9.2-initd.patch | 25 -----
17 .../fail2ban/files/fail2ban-0.9.2-logrotate.patch | 12 ---
18 6 files changed, 354 deletions(-)
19
20 diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
21 index 0c8ede3fd2b..79e5dbce864 100644
22 --- a/net-analyzer/fail2ban/Manifest
23 +++ b/net-analyzer/fail2ban/Manifest
24 @@ -1,4 +1 @@
25 -DIST fail2ban-0.9.3.tar.gz 321960 SHA256 146811530b7acf706db6d28068ee60806f6e0c80da14d89b732955a696728c46 SHA512 c8f45f776677a1e2e222feb4e33499a59c0c1c108365b759daf417870e2cc717a8b26073869eb3846a24928d8a2d33225761a19965b804bb7fee750e86cef6c8 WHIRLPOOL d01a25a9ac422e538e15db5f4f6c5015ee5c429c8fa6adf35accb80ce56f8e703e5104860ca7b205b927697b20a9a1109852dc6059b6ce208c432e0661a78edb
26 -DIST fail2ban-0.9.4.tar.gz 335521 SHA256 9a4a6402f8e6bda15ef8b5a848ce8d91d80735356b52dfac0d7612cdd2fbcaf3 SHA512 fee7368adf30c9b5a47309c0c519de9fb0113a49b5e69d0f9396b5fb3dc9a3c6a5a51fef155fcf7debd86eb839441d1199c992fa8211da83a81f7c182c4a2125 WHIRLPOOL 5d44f39204eb3717f00102c686b5b3873555b82dd3bcae0bfbbb96f54e15d0d020655c3b3efe51536a5746489d133e2dc5bf3d3b7081c6619ba2ab715abe4ba2
27 -DIST fail2ban-0.9.5.tar.gz 342310 SHA256 7fec0e7a23a315358b09580962920d3faec7369a85a0c9f349775b06605aa759 SHA512 d894a5f62d553ccdb406a25163995a655cbd952c1253e966d1b27500bd8431c6e7eba33400412a0ef9df844e1f31ce544b80fb49e3706f7536f58e8d84022d51 WHIRLPOOL 555f929535f68612a05eecbd6ff1ef8d39412dff156e0d06d0c8268f2319797e9f4272e99a09660b784cc38ba9321f9c2d74b5af4164c2aee261c44bdc2451fa
28 DIST fail2ban-0.9.6.tar.gz 352145 SHA256 c6758b43f9d673ec014fc2f2d3497476d5396f9f85e37724a638b43dfdde7a97 SHA512 c09778d39741dc38d1073495a9f491012717d5ed04d28722f2ae6755104bdcc472baf06d33f500fed592b04c05277ba5cf74e527f1c0ed751108f4f1be22fa7e WHIRLPOOL a18b4d2905d8c2d4bbb8121bf4a7f69ce1d95ecb9fa521d753fd5f103bf463ada09d04e4e60b9191dce56cfced09426f74397c09df87bffeaf13dc7358a570b4
29
30 diff --git a/net-analyzer/fail2ban/fail2ban-0.9.3-r1.ebuild b/net-analyzer/fail2ban/fail2ban-0.9.3-r1.ebuild
31 deleted file mode 100644
32 index e2e0606eacd..00000000000
33 --- a/net-analyzer/fail2ban/fail2ban-0.9.3-r1.ebuild
34 +++ /dev/null
35 @@ -1,108 +0,0 @@
36 -# Copyright 1999-2016 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=5
40 -PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
41 -DISTUTILS_SINGLE_IMPL=1
42 -
43 -inherit distutils-r1 eutils systemd vcs-snapshot
44 -
45 -DESCRIPTION="scans log files and bans IPs that show malicious signs"
46 -HOMEPAGE="http://www.fail2ban.org/"
47 -SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
48 -
49 -LICENSE="GPL-2"
50 -SLOT="0"
51 -KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
52 -IUSE="selinux systemd"
53 -
54 -# TODO support ipfw and ipfilter
55 -RDEPEND="
56 - kernel_linux? ( net-firewall/iptables )
57 - kernel_FreeBSD? ( sys-freebsd/freebsd-pf )
58 - net-misc/whois
59 - virtual/logger
60 - virtual/mta
61 - selinux? ( sec-policy/selinux-fail2ban )
62 - systemd? ( $(python_gen_cond_dep '|| (
63 - dev-python/python-systemd[${PYTHON_USEDEP}]
64 - sys-apps/systemd[python(-),${PYTHON_USEDEP}]
65 - )' 'python*' ) )
66 -"
67 -
68 -REQUIRED_USE="systemd? ( !python_single_target_pypy )"
69 -
70 -DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
71 -
72 -python_prepare_all() {
73 - # Replace /var/run with /run, but not in the top source directory
74 - find . -mindepth 2 -type f -exec \
75 - sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
76 -
77 - # Fix bashisms and do not direct useful output to /dev/null (bug #536320)
78 - # Remove global logrotate settings (bug #549856)
79 - epatch \
80 - "${FILESDIR}"/${PN}-0.9.2-initd.patch \
81 - "${FILESDIR}"/${PN}-0.9.2-logrotate.patch
82 -
83 - distutils-r1_python_prepare_all
84 -}
85 -
86 -python_test() {
87 - "${PYTHON}" "bin/${PN}-testcases" || die "tests failed with ${EPYTHON}"
88 -}
89 -
90 -python_install_all() {
91 - distutils-r1_python_install_all
92 -
93 - rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die
94 -
95 - # not FILESDIR
96 - newconfd files/gentoo-confd ${PN}
97 - newinitd files/gentoo-initd ${PN}
98 - systemd_dounit files/${PN}.service
99 - systemd_dotmpfilesd files/${PN}-tmpfiles.conf
100 - doman man/*.{1,5}
101 -
102 - # Use INSTALL_MASK if you do not want to touch /etc/logrotate.d.
103 - # See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
104 - insinto /etc/logrotate.d
105 - newins files/${PN}-logrotate ${PN}
106 -}
107 -
108 -pkg_preinst() {
109 - has_version "<${CATEGORY}/${PN}-0.7"
110 - previous_less_than_0_7=$?
111 -}
112 -
113 -pkg_postinst() {
114 - if [[ $previous_less_than_0_7 = 0 ]] ; then
115 - elog
116 - elog "Configuration files are now in /etc/fail2ban/"
117 - elog "You probably have to manually update your configuration"
118 - elog "files before restarting Fail2ban!"
119 - elog
120 - elog "Fail2ban is not installed under /usr/lib anymore. The"
121 - elog "new location is under /usr/share."
122 - elog
123 - elog "You are upgrading from version 0.6.x, please see:"
124 - elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
125 - fi
126 - if ! has_version ${CATEGORY}/${PN}; then
127 - if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then
128 - elog "For most jail.conf configurations, it is recommended you install either"
129 - elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
130 - elog "to control how log file modifications are detected"
131 - fi
132 -
133 - if ! has_version dev-lang/python[sqlite]; then
134 - elog "If you want to use ${PN}'s persistent database, then reinstall"
135 - elog "dev-lang/python with USE=sqlite"
136 - fi
137 -
138 - if has_version sys-apps/systemd[-python]; then
139 - elog "If you want to track logins through sys-apps/systemd's"
140 - elog "journal backend, then reinstall sys-apps/systemd with USE=python"
141 - fi
142 - fi
143 -}
144
145 diff --git a/net-analyzer/fail2ban/fail2ban-0.9.4.ebuild b/net-analyzer/fail2ban/fail2ban-0.9.4.ebuild
146 deleted file mode 100644
147 index f65dee1387a..00000000000
148 --- a/net-analyzer/fail2ban/fail2ban-0.9.4.ebuild
149 +++ /dev/null
150 @@ -1,102 +0,0 @@
151 -# Copyright 1999-2016 Gentoo Foundation
152 -# Distributed under the terms of the GNU General Public License v2
153 -
154 -EAPI=5
155 -PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
156 -DISTUTILS_SINGLE_IMPL=1
157 -
158 -inherit distutils-r1 eutils systemd vcs-snapshot
159 -
160 -DESCRIPTION="scans log files and bans IPs that show malicious signs"
161 -HOMEPAGE="http://www.fail2ban.org/"
162 -SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
163 -
164 -LICENSE="GPL-2"
165 -SLOT="0"
166 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
167 -IUSE="selinux systemd"
168 -
169 -# TODO support ipfw and ipfilter
170 -RDEPEND="
171 - kernel_linux? ( net-firewall/iptables )
172 - kernel_FreeBSD? ( sys-freebsd/freebsd-pf )
173 - net-misc/whois
174 - virtual/logger
175 - virtual/mta
176 - selinux? ( sec-policy/selinux-fail2ban )
177 - systemd? ( $(python_gen_cond_dep '|| (
178 - dev-python/python-systemd[${PYTHON_USEDEP}]
179 - sys-apps/systemd[python(-),${PYTHON_USEDEP}]
180 - )' 'python*' ) )
181 -"
182 -
183 -REQUIRED_USE="systemd? ( !python_single_target_pypy )"
184 -
185 -DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
186 -
187 -python_prepare_all() {
188 - # Replace /var/run with /run, but not in the top source directory
189 - find . -mindepth 2 -type f -exec \
190 - sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
191 -
192 - distutils-r1_python_prepare_all
193 -}
194 -
195 -python_test() {
196 - "${PYTHON}" "bin/${PN}-testcases" || die "tests failed with ${EPYTHON}"
197 -}
198 -
199 -python_install_all() {
200 - distutils-r1_python_install_all
201 -
202 - rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die
203 -
204 - # not FILESDIR
205 - newconfd files/gentoo-confd ${PN}
206 - newinitd files/gentoo-initd ${PN}
207 - systemd_dounit files/${PN}.service
208 - systemd_dotmpfilesd files/${PN}-tmpfiles.conf
209 - doman man/*.{1,5}
210 -
211 - # Use INSTALL_MASK if you do not want to touch /etc/logrotate.d.
212 - # See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
213 - insinto /etc/logrotate.d
214 - newins files/${PN}-logrotate ${PN}
215 -}
216 -
217 -pkg_preinst() {
218 - has_version "<${CATEGORY}/${PN}-0.7"
219 - previous_less_than_0_7=$?
220 -}
221 -
222 -pkg_postinst() {
223 - if [[ $previous_less_than_0_7 = 0 ]] ; then
224 - elog
225 - elog "Configuration files are now in /etc/fail2ban/"
226 - elog "You probably have to manually update your configuration"
227 - elog "files before restarting Fail2ban!"
228 - elog
229 - elog "Fail2ban is not installed under /usr/lib anymore. The"
230 - elog "new location is under /usr/share."
231 - elog
232 - elog "You are upgrading from version 0.6.x, please see:"
233 - elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
234 - fi
235 - if ! has_version ${CATEGORY}/${PN}; then
236 - if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then
237 - elog "For most jail.conf configurations, it is recommended you install either"
238 - elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
239 - elog "to control how log file modifications are detected"
240 - fi
241 -
242 - if ! has_version dev-lang/python[sqlite]; then
243 - elog "If you want to use ${PN}'s persistent database, then reinstall"
244 - elog "dev-lang/python with USE=sqlite"
245 - fi
246 -
247 - if has_version sys-apps/systemd[-python]; then
248 - elog "If you want to track logins through sys-apps/systemd's"
249 - elog "journal backend, then reinstall sys-apps/systemd with USE=python"
250 - fi
251 - fi
252 -}
253
254 diff --git a/net-analyzer/fail2ban/fail2ban-0.9.5.ebuild b/net-analyzer/fail2ban/fail2ban-0.9.5.ebuild
255 deleted file mode 100644
256 index f9375b0e5ad..00000000000
257 --- a/net-analyzer/fail2ban/fail2ban-0.9.5.ebuild
258 +++ /dev/null
259 @@ -1,104 +0,0 @@
260 -# Copyright 1999-2016 Gentoo Foundation
261 -# Distributed under the terms of the GNU General Public License v2
262 -
263 -EAPI=5
264 -PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
265 -DISTUTILS_SINGLE_IMPL=1
266 -
267 -inherit distutils-r1 eutils systemd vcs-snapshot
268 -
269 -DESCRIPTION="scans log files and bans IPs that show malicious signs"
270 -HOMEPAGE="http://www.fail2ban.org/"
271 -SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
272 -
273 -LICENSE="GPL-2"
274 -SLOT="0"
275 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
276 -IUSE="selinux systemd"
277 -
278 -# TODO support ipfw and ipfilter
279 -RDEPEND="
280 - kernel_linux? ( net-firewall/iptables )
281 - kernel_FreeBSD? ( sys-freebsd/freebsd-pf )
282 - net-misc/whois
283 - virtual/logger
284 - virtual/mta
285 - selinux? ( sec-policy/selinux-fail2ban )
286 - systemd? ( $(python_gen_cond_dep '|| (
287 - dev-python/python-systemd[${PYTHON_USEDEP}]
288 - sys-apps/systemd[python(-),${PYTHON_USEDEP}]
289 - )' 'python*' ) )
290 -"
291 -
292 -REQUIRED_USE="systemd? ( !python_single_target_pypy )"
293 -
294 -DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
295 -
296 -python_prepare_all() {
297 - # Replace /var/run with /run, but not in the top source directory
298 - find . -mindepth 2 -type f -exec \
299 - sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
300 -
301 - sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die
302 -
303 - distutils-r1_python_prepare_all
304 -}
305 -
306 -python_test() {
307 - "${PYTHON}" "bin/${PN}-testcases" || die "tests failed with ${EPYTHON}"
308 -}
309 -
310 -python_install_all() {
311 - distutils-r1_python_install_all
312 -
313 - rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die
314 -
315 - # not FILESDIR
316 - newconfd files/gentoo-confd ${PN}
317 - newinitd files/gentoo-initd ${PN}
318 - systemd_dounit files/${PN}.service
319 - systemd_dotmpfilesd files/${PN}-tmpfiles.conf
320 - doman man/*.{1,5}
321 -
322 - # Use INSTALL_MASK if you do not want to touch /etc/logrotate.d.
323 - # See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
324 - insinto /etc/logrotate.d
325 - newins files/${PN}-logrotate ${PN}
326 -}
327 -
328 -pkg_preinst() {
329 - has_version "<${CATEGORY}/${PN}-0.7"
330 - previous_less_than_0_7=$?
331 -}
332 -
333 -pkg_postinst() {
334 - if [[ $previous_less_than_0_7 = 0 ]] ; then
335 - elog
336 - elog "Configuration files are now in /etc/fail2ban/"
337 - elog "You probably have to manually update your configuration"
338 - elog "files before restarting Fail2ban!"
339 - elog
340 - elog "Fail2ban is not installed under /usr/lib anymore. The"
341 - elog "new location is under /usr/share."
342 - elog
343 - elog "You are upgrading from version 0.6.x, please see:"
344 - elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
345 - fi
346 - if ! has_version ${CATEGORY}/${PN}; then
347 - if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then
348 - elog "For most jail.conf configurations, it is recommended you install either"
349 - elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
350 - elog "to control how log file modifications are detected"
351 - fi
352 -
353 - if ! has_version dev-lang/python[sqlite]; then
354 - elog "If you want to use ${PN}'s persistent database, then reinstall"
355 - elog "dev-lang/python with USE=sqlite"
356 - fi
357 -
358 - if has_version sys-apps/systemd[-python]; then
359 - elog "If you want to track logins through sys-apps/systemd's"
360 - elog "journal backend, then reinstall sys-apps/systemd with USE=python"
361 - fi
362 - fi
363 -}
364
365 diff --git a/net-analyzer/fail2ban/files/fail2ban-0.9.2-initd.patch b/net-analyzer/fail2ban/files/fail2ban-0.9.2-initd.patch
366 deleted file mode 100644
367 index 47bffe6af9f..00000000000
368 --- a/net-analyzer/fail2ban/files/fail2ban-0.9.2-initd.patch
369 +++ /dev/null
370 @@ -1,25 +0,0 @@
371 ---- a/files/gentoo-initd
372 -+++ b/files/gentoo-initd
373 -@@ -38,19 +38,19 @@
374 - # bug 347477
375 - rm -rf /run/fail2ban/fail2ban.sock || return 1
376 - fi
377 -- ${FAIL2BAN} start &> /dev/null
378 -+ ${FAIL2BAN} start
379 - eend $? "Failed to start fail2ban"
380 - }
381 -
382 - stop() {
383 - ebegin "Stopping fail2ban"
384 -- ${FAIL2BAN} stop &> /dev/null
385 -+ ${FAIL2BAN} stop
386 - eend $? "Failed to stop fail2ban"
387 - }
388 -
389 - reload() {
390 - ebegin "Reloading fail2ban"
391 -- ${FAIL2BAN} reload > /dev/null
392 -+ ${FAIL2BAN} reload
393 - eend $? "Failed to reload fail2ban"
394 - }
395 -
396
397 diff --git a/net-analyzer/fail2ban/files/fail2ban-0.9.2-logrotate.patch b/net-analyzer/fail2ban/files/fail2ban-0.9.2-logrotate.patch
398 deleted file mode 100644
399 index 65354a2a025..00000000000
400 --- a/net-analyzer/fail2ban/files/fail2ban-0.9.2-logrotate.patch
401 +++ /dev/null
402 @@ -1,12 +0,0 @@
403 ---- a/files/fail2ban-logrotate
404 -+++ b/files/fail2ban-logrotate
405 -@@ -9,9 +9,7 @@
406 - # http://pkgs.fedoraproject.org/cgit/fail2ban.git/tree/fail2ban-logrotate
407 -
408 - /var/log/fail2ban.log {
409 -- rotate 7
410 - missingok
411 -- compress
412 - postrotate
413 - /usr/bin/fail2ban-client flushlogs 1>/dev/null || true
414 - endscript