[net-analyzer/fail2ban] delete tmpfiles.d, no longer included upstream

This commit is contained in:
2026-04-18 21:19:54 +02:00
parent 5eea298bc0
commit afb4a4e330
5 changed files with 243 additions and 0 deletions

View File

@@ -0,0 +1,29 @@
From bda9b88e883207b99781352c68610980e23fa62f Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
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

View File

@@ -0,0 +1,45 @@
Avoid corrupting umask permanently in the testdir because of fail2ban/server/server.py::start.
In particular:
* https://bugs.gentoo.org/659010#c11
* https://bugs.gentoo.org/790251#c10
* https://bugs.gentoo.org/907350
But see also the many dupes.
--- a/fail2ban/tests/fail2banclienttestcase.py
+++ b/fail2ban/tests/fail2banclienttestcase.py
@@ -23,6 +23,7 @@ __author__ = "Serg Brester"
__copyright__ = "Copyright (c) 2014- Serg G. Brester (sebres), 2008- Fail2Ban Contributors"
__license__ = "GPL"
+import atexit
import fileinput
import os
import re
@@ -40,6 +41,14 @@ from ..client.fail2bancmdline import Fail2banCmdLine
from ..client.fail2banclient import exec_command_line as _exec_client, CSocket, VisualWait
from ..client.fail2banserver import Fail2banServer, exec_command_line as _exec_server
from .. import protocol
+
+def current_umask():
+ tmp = os.umask(0o022)
+ os.umask(tmp)
+ return tmp
+
+old_umask = current_umask()
+
from ..server import server
from ..server.mytime import MyTime
from ..server.utils import Utils
@@ -48,6 +57,11 @@ from .utils import LogCaptureTestCase, logSys as DefLogSys, with_tmpdir, shutil,
from ..helpers import getLogger
+def restore_umask():
+ os.umask(old_umask)
+
+atexit.register(restore_umask)
+
# Gets the instance of the logger.
logSys = getLogger(__name__)

View File

@@ -0,0 +1,14 @@
https://bugs.gentoo.org/871996
--- a/files/fail2ban.service.in
+++ b/files/fail2ban.service.in
@@ -1,7 +1,10 @@
[Unit]
Description=Fail2Ban Service
Documentation=man:fail2ban(1)
+
+Before=iptables-store.service ip6tables-store.service
After=network.target iptables.service firewalld.service ip6tables.service ipset.service nftables.service
+After=iptables-restore.service ip6tables-restore.service
PartOf=iptables.service firewalld.service ip6tables.service ipset.service nftables.service
[Service]