commit: 00402f66d1cdf8144ff08f446010cfdbd8d2fe4a Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Aug 11 01:00:15 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Aug 11 01:00:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00402f66
net-analyzer/fail2ban: fix Apache log path Closes: https://bugs.gentoo.org/805485 Signed-off-by: Sam James <sam <AT> gentoo.org> ...l2ban-9999.ebuild => fail2ban-0.11.2-r1.ebuild} | 12 ++++++--- net-analyzer/fail2ban/fail2ban-9999.ebuild | 6 ++++- .../fail2ban-0.11.2-adjust-apache-logs-paths.patch | 29 ++++++++++++++++++++++ 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/net-analyzer/fail2ban/fail2ban-9999.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.2-r1.ebuild similarity index 94% copy from net-analyzer/fail2ban/fail2ban-9999.ebuild copy to net-analyzer/fail2ban/fail2ban-0.11.2-r1.ebuild index 2ad8f462e23..a858cbe09d2 100644 --- a/net-analyzer/fail2ban/fail2ban-9999.ebuild +++ b/net-analyzer/fail2ban/fail2ban-0.11.2-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{8,9} ) DISTUTILS_SINGLE_IMPL=1 inherit bash-completion-r1 distutils-r1 systemd tmpfiles @@ -31,13 +31,17 @@ RDEPEND=" || ( dev-python/python-systemd[${PYTHON_USEDEP}] sys-apps/systemd[python(-),${PYTHON_USEDEP}] - ) - ' 'python*') + )' 'python*' ) ) " DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt ) +PATCHES=( + "${FILESDIR}"/${P}-fix-tests-for-2021.patch + "${FILESDIR}"/${PN}-0.11.2-adjust-apache-logs-paths.patch +) + python_prepare_all() { # Replace /var/run with /run, but not in the top source directory find . -mindepth 2 -type f -exec \ @@ -94,7 +98,7 @@ pkg_preinst() { pkg_postinst() { tmpfiles_process ${PN}-tmpfiles.conf - if [[ ${previous_less_than_0_7} == 0 ]] ; then + 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" diff --git a/net-analyzer/fail2ban/fail2ban-9999.ebuild b/net-analyzer/fail2ban/fail2ban-9999.ebuild index 2ad8f462e23..9d117cebef4 100644 --- a/net-analyzer/fail2ban/fail2ban-9999.ebuild +++ b/net-analyzer/fail2ban/fail2ban-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{8,9} ) DISTUTILS_SINGLE_IMPL=1 inherit bash-completion-r1 distutils-r1 systemd tmpfiles @@ -38,6 +38,10 @@ RDEPEND=" DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt ) +PATCHES=( + "${FILESDIR}"/${PN}-0.11.2-adjust-apache-logs-paths.patch +) + python_prepare_all() { # Replace /var/run with /run, but not in the top source directory find . -mindepth 2 -type f -exec \ diff --git a/net-analyzer/fail2ban/files/fail2ban-0.11.2-adjust-apache-logs-paths.patch b/net-analyzer/fail2ban/files/fail2ban-0.11.2-adjust-apache-logs-paths.patch new file mode 100644 index 00000000000..3017883f0d5 --- /dev/null +++ b/net-analyzer/fail2ban/files/fail2ban-0.11.2-adjust-apache-logs-paths.patch @@ -0,0 +1,29 @@ +From bda9b88e883207b99781352c68610980e23fa62f Mon Sep 17 00:00:00 2001 +From: Sam James <[email protected]> +Date: Wed, 11 Aug 2021 01:58:05 +0100 +Subject: [PATCH] Adjust Apache log paths for Gentoo + +Closes: https://bugs.gentoo.org/805485 +--- + config/paths-common.conf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/config/paths-common.conf b/config/paths-common.conf +index 7383caf..4f4a6e1 100644 +--- a/config/paths-common.conf ++++ b/config/paths-common.conf +@@ -36,9 +36,9 @@ sshd_backend = %(default_backend)s + dropbear_log = %(syslog_authpriv)s + dropbear_backend = %(default_backend)s + +-apache_error_log = /var/log/apache2/*error.log ++apache_error_log = /var/log/apache2/*error_log + +-apache_access_log = /var/log/apache2/*access.log ++apache_access_log = /var/log/apache2/*access_log + + # from /etc/audit/auditd.conf + auditd_log = /var/log/audit/audit.log +-- +2.32.0 +
