From ae9ee1fe923bc3a32d7cb13aa1be1527d86d96d0 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sat, 8 Feb 2020 07:45:45 +0100 Subject: net-analyzer/fail2ban: Switch to PYTHON_MULTI_USEDEP API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- net-analyzer/fail2ban/fail2ban-0.10.4-r1.ebuild | 110 +++++++++++++++++++++++ net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild | 4 +- net-analyzer/fail2ban/fail2ban-0.10.4.ebuild | 110 ----------------------- net-analyzer/fail2ban/fail2ban-0.10.5-r1.ebuild | 4 +- net-analyzer/fail2ban/fail2ban-0.11.1-r1.ebuild | 111 ------------------------ net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild | 111 ++++++++++++++++++++++++ net-analyzer/fail2ban/fail2ban-99999999.ebuild | 4 +- 7 files changed, 227 insertions(+), 227 deletions(-) create mode 100644 net-analyzer/fail2ban/fail2ban-0.10.4-r1.ebuild delete mode 100644 net-analyzer/fail2ban/fail2ban-0.10.4.ebuild delete mode 100644 net-analyzer/fail2ban/fail2ban-0.11.1-r1.ebuild create mode 100644 net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/fail2ban/fail2ban-0.10.4-r1.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.4-r1.ebuild new file mode 100644 index 000000000000..1db3b7bffdde --- /dev/null +++ b/net-analyzer/fail2ban/fail2ban-0.10.4-r1.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python3_6 ) +DISTUTILS_SINGLE_IMPL=1 + +inherit distutils-r1 eutils systemd vcs-snapshot + +DESCRIPTION="scans log files and bans IPs that show malicious signs" +HOMEPAGE="https://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" +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_MULTI_USEDEP}] + sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}] + )' 'python*' ) ) +" + +RESTRICT="test" +DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt ) + +python_prepare_all() { + eapply_user + + # 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 index 653f99607543..652d96b809db 100644 --- a/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild +++ b/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild @@ -21,8 +21,8 @@ RDEPEND=" virtual/mta selinux? ( sec-policy/selinux-fail2ban ) systemd? ( $(python_gen_cond_dep '|| ( - dev-python/python-systemd[${PYTHON_USEDEP}] - sys-apps/systemd[python(-),${PYTHON_USEDEP}] + dev-python/python-systemd[${PYTHON_MULTI_USEDEP}] + sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}] )' 'python*' ) ) " diff --git a/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild deleted file mode 100644 index f20a2d4b3e73..000000000000 --- a/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_6 ) -DISTUTILS_SINGLE_IMPL=1 - -inherit distutils-r1 eutils systemd vcs-snapshot - -DESCRIPTION="scans log files and bans IPs that show malicious signs" -HOMEPAGE="https://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" -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*' ) ) -" - -RESTRICT="test" -DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt ) - -python_prepare_all() { - eapply_user - - # 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.5-r1.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.5-r1.ebuild index e4b07d80df20..e00569c23f08 100644 --- a/net-analyzer/fail2ban/fail2ban-0.10.5-r1.ebuild +++ b/net-analyzer/fail2ban/fail2ban-0.10.5-r1.ebuild @@ -21,8 +21,8 @@ RDEPEND=" virtual/mta selinux? ( sec-policy/selinux-fail2ban ) systemd? ( $(python_gen_cond_dep '|| ( - dev-python/python-systemd[${PYTHON_USEDEP}] - sys-apps/systemd[python(-),${PYTHON_USEDEP}] + dev-python/python-systemd[${PYTHON_MULTI_USEDEP}] + sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}] )' 'python*' ) ) " diff --git a/net-analyzer/fail2ban/fail2ban-0.11.1-r1.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.1-r1.ebuild deleted file mode 100644 index dc79df197e2d..000000000000 --- a/net-analyzer/fail2ban/fail2ban-0.11.1-r1.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_6 ) -DISTUTILS_SINGLE_IMPL=1 - -inherit bash-completion-r1 distutils-r1 systemd - -DESCRIPTION="scans log files and bans IPs that show malicious signs" -HOMEPAGE="https://www.fail2ban.org/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" -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*' ) ) -" - -RESTRICT="test" -DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt ) - -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} - - newbashcomp files/bash-completion ${PN}-client - bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex -} - -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. If you do not use the" - elog "persistent database feature, then you should set" - elog "dbfile = :memory: in fail2ban.conf accordingly." - 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.11.1-r2.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild new file mode 100644 index 000000000000..12997e0f764a --- /dev/null +++ b/net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_6 ) +DISTUTILS_SINGLE_IMPL=1 + +inherit bash-completion-r1 distutils-r1 systemd + +DESCRIPTION="scans log files and bans IPs that show malicious signs" +HOMEPAGE="https://www.fail2ban.org/" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="selinux systemd" + +RDEPEND=" + virtual/logger + virtual/mta + selinux? ( sec-policy/selinux-fail2ban ) + systemd? ( $(python_gen_cond_dep '|| ( + dev-python/python-systemd[${PYTHON_MULTI_USEDEP}] + sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}] + )' 'python*' ) ) +" + +RESTRICT="test" +DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt ) + +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} + + newbashcomp files/bash-completion ${PN}-client + bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex +} + +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. If you do not use the" + elog "persistent database feature, then you should set" + elog "dbfile = :memory: in fail2ban.conf accordingly." + 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 4d89363141a8..4bde96c6afe5 100644 --- a/net-analyzer/fail2ban/fail2ban-99999999.ebuild +++ b/net-analyzer/fail2ban/fail2ban-99999999.ebuild @@ -21,8 +21,8 @@ RDEPEND=" virtual/mta selinux? ( sec-policy/selinux-fail2ban ) systemd? ( $(python_gen_cond_dep '|| ( - dev-python/python-systemd[${PYTHON_USEDEP}] - sys-apps/systemd[python(-),${PYTHON_USEDEP}] + dev-python/python-systemd[${PYTHON_MULTI_USEDEP}] + sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}] )' 'python*' ) ) " -- cgit v1.2.3-65-gdbad