From 19d568a99cb999a26abb068949fccc771a0fea15 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Wed, 27 Mar 2019 11:18:19 +0100 Subject: net-analyzer/fail2ban: Drop various optional runtime dependencies Support for net-firewall/iptables, net-misc/whois and sys-freebsd/freebsd-pf is entirely optional and depends on your local configuration. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Fixes: https://bugs.gentoo.org/627872 Signed-off-by: Jeroen Roovers --- net-analyzer/fail2ban/fail2ban-0.10.4-r1.ebuild | 115 ------------------------ net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild | 111 +++++++++++++++++++++++ net-analyzer/fail2ban/fail2ban-99999999.ebuild | 4 - 3 files changed, 111 insertions(+), 119 deletions(-) delete mode 100644 net-analyzer/fail2ban/fail2ban-0.10.4-r1.ebuild create mode 100644 net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild diff --git a/net-analyzer/fail2ban/fail2ban-0.10.4-r1.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.4-r1.ebuild deleted file mode 100644 index 08162400a076..000000000000 --- a/net-analyzer/fail2ban/fail2ban-0.10.4-r1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) -DISTUTILS_SINGLE_IMPL=1 - -inherit distutils-r1 systemd - -DESCRIPTION="scans log files and bans IPs that show malicious signs" -HOMEPAGE="http://www.fail2ban.org/" -SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="selinux systemd" - -# TODO support ipfw and ipfilter -RDEPEND=" - kernel_linux? ( net-firewall/iptables ) - kernel_FreeBSD? ( sys-freebsd/freebsd-pf ) - net-misc/whois - virtual/logger - virtual/mta - selinux? ( sec-policy/selinux-fail2ban ) - systemd? ( $(python_gen_cond_dep '|| ( - dev-python/python-systemd[${PYTHON_USEDEP}] - sys-apps/systemd[python(-),${PYTHON_USEDEP}] - )' 'python*' ) ) -" -REQUIRED_USE="systemd? ( !python_single_target_pypy )" -RESTRICT="test" -DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt ) - -src_unpack() { - default - mv ${PN}-${PN}-* ${P} || die -} - -python_prepare_all() { - default - - # Replace /var/run with /run, but not in the top source directory - find . -mindepth 2 -type f -exec \ - sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die - - sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die - - distutils-r1_python_prepare_all -} - -python_compile() { - if python_is_python3; then - ./fail2ban-2to3 || die - fi - distutils-r1_python_compile -} - -python_install_all() { - distutils-r1_python_install_all - - rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die - - # not FILESDIR - newconfd files/gentoo-confd ${PN} - newinitd files/gentoo-initd ${PN} - sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}/${PN}.service" || die - systemd_dounit "${T}/${PN}.service" - systemd_dotmpfilesd files/${PN}-tmpfiles.conf - doman man/*.{1,5} - - # Use INSTALL_MASK if you do not want to touch /etc/logrotate.d. - # See http://thread.gmane.org/gmane.linux.gentoo.devel/35675 - insinto /etc/logrotate.d - newins files/${PN}-logrotate ${PN} - - keepdir /var/lib/${PN} -} - -pkg_preinst() { - has_version "<${CATEGORY}/${PN}-0.7" - previous_less_than_0_7=$? -} - -pkg_postinst() { - if [[ $previous_less_than_0_7 = 0 ]] ; then - elog - elog "Configuration files are now in /etc/fail2ban/" - elog "You probably have to manually update your configuration" - elog "files before restarting Fail2ban!" - elog - elog "Fail2ban is not installed under /usr/lib anymore. The" - elog "new location is under /usr/share." - elog - elog "You are upgrading from version 0.6.x, please see:" - elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8" - fi - - if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then - elog "For most jail.conf configurations, it is recommended you install either" - elog "dev-python/pyinotify or app-admin/gamin (in order of preference)" - elog "to control how log file modifications are detected" - fi - - if ! has_version dev-lang/python[sqlite]; then - elog "If you want to use ${PN}'s persistent database, then reinstall" - elog "dev-lang/python with USE=sqlite" - fi - - if has_version sys-apps/systemd[-python]; then - elog "If you want to track logins through sys-apps/systemd's" - elog "journal backend, then reinstall sys-apps/systemd with USE=python" - fi -} diff --git a/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild new file mode 100644 index 000000000000..1f4495bb15b8 --- /dev/null +++ b/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) +DISTUTILS_SINGLE_IMPL=1 + +inherit distutils-r1 systemd + +DESCRIPTION="scans log files and bans IPs that show malicious signs" +HOMEPAGE="http://www.fail2ban.org/" +SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="selinux systemd" + +RDEPEND=" + virtual/logger + virtual/mta + selinux? ( sec-policy/selinux-fail2ban ) + systemd? ( $(python_gen_cond_dep '|| ( + dev-python/python-systemd[${PYTHON_USEDEP}] + sys-apps/systemd[python(-),${PYTHON_USEDEP}] + )' 'python*' ) ) +" +REQUIRED_USE="systemd? ( !python_single_target_pypy )" +RESTRICT="test" +DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt ) + +src_unpack() { + default + mv ${PN}-${PN}-* ${P} || die +} + +python_prepare_all() { + default + + # Replace /var/run with /run, but not in the top source directory + find . -mindepth 2 -type f -exec \ + sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die + + sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die + + distutils-r1_python_prepare_all +} + +python_compile() { + if python_is_python3; then + ./fail2ban-2to3 || die + fi + distutils-r1_python_compile +} + +python_install_all() { + distutils-r1_python_install_all + + rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die + + # not FILESDIR + newconfd files/gentoo-confd ${PN} + newinitd files/gentoo-initd ${PN} + sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}/${PN}.service" || die + systemd_dounit "${T}/${PN}.service" + systemd_dotmpfilesd files/${PN}-tmpfiles.conf + doman man/*.{1,5} + + # Use INSTALL_MASK if you do not want to touch /etc/logrotate.d. + # See http://thread.gmane.org/gmane.linux.gentoo.devel/35675 + insinto /etc/logrotate.d + newins files/${PN}-logrotate ${PN} + + keepdir /var/lib/${PN} +} + +pkg_preinst() { + has_version "<${CATEGORY}/${PN}-0.7" + previous_less_than_0_7=$? +} + +pkg_postinst() { + if [[ $previous_less_than_0_7 = 0 ]] ; then + elog + elog "Configuration files are now in /etc/fail2ban/" + elog "You probably have to manually update your configuration" + elog "files before restarting Fail2ban!" + elog + elog "Fail2ban is not installed under /usr/lib anymore. The" + elog "new location is under /usr/share." + elog + elog "You are upgrading from version 0.6.x, please see:" + elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8" + fi + + if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then + elog "For most jail.conf configurations, it is recommended you install either" + elog "dev-python/pyinotify or app-admin/gamin (in order of preference)" + elog "to control how log file modifications are detected" + fi + + if ! has_version dev-lang/python[sqlite]; then + elog "If you want to use ${PN}'s persistent database, then reinstall" + elog "dev-lang/python with USE=sqlite" + fi + + if has_version sys-apps/systemd[-python]; then + elog "If you want to track logins through sys-apps/systemd's" + elog "journal backend, then reinstall sys-apps/systemd with USE=python" + fi +} diff --git a/net-analyzer/fail2ban/fail2ban-99999999.ebuild b/net-analyzer/fail2ban/fail2ban-99999999.ebuild index 3eb5b64cab5e..0adb597ee8cc 100644 --- a/net-analyzer/fail2ban/fail2ban-99999999.ebuild +++ b/net-analyzer/fail2ban/fail2ban-99999999.ebuild @@ -16,11 +16,7 @@ SLOT="0" KEYWORDS="" IUSE="selinux systemd" -# TODO support ipfw and ipfilter RDEPEND=" - kernel_linux? ( net-firewall/iptables ) - kernel_FreeBSD? ( sys-freebsd/freebsd-pf ) - net-misc/whois virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) -- cgit v1.2.3-18-g5258