git: 82ad1b7e038a - 2021Q2 - security/py-fail2ban: Create required start dir

[Kevin Bowling]

The branch 2021Q2 has been updated by kbowling:

URL: https://cgit.FreeBSD.org/ports/commit/?id=82ad1b7e038ab9a71929742ad86b4bf463d0709d

commit 82ad1b7e038ab9a71929742ad86b4bf463d0709d
Author:     Florian Koczan <theis at gmx.at>
AuthorDate: 2021-06-15 16:02:44 +0000
Commit:     Kevin Bowling <kbowling at FreeBSD.org>
CommitDate: 2021-06-15 16:05:36 +0000

    security/py-fail2ban: Create required start dir
    
    Reported at https://github.com/fail2ban/fail2ban/issues/2634
    fail2ban should check and, if necessary create, the required directory.
    
    It is still up to the user to ensure that configuration in fail2ban's
    conf files and FreeBSD's /etc/rc.conf are in sync and that both, pidfile
    and socket reside in the same directory.
    
    PR:             244092
    Approved by:    maintainer
    MFH:            2021Q2
    
    (cherry picked from commit b48d2a658ef96565393b9186cbed85803b2b87e0)
---
 security/py-fail2ban/Makefile          | 1 +
 security/py-fail2ban/files/fail2ban.in | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/security/py-fail2ban/Makefile b/security/py-fail2ban/Makefile
index a5663f9d696f..2e91fdc9b048 100644
--- a/security/py-fail2ban/Makefile
+++ b/security/py-fail2ban/Makefile
@@ -1,6 +1,7 @@
 
 PORTNAME=	fail2ban
 PORTVERSION=	0.11.2
+PORTREVISION=	1
 CATEGORIES=	security python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/security/py-fail2ban/files/fail2ban.in b/security/py-fail2ban/files/fail2ban.in
index b20c0106dba5..a0cd0de97f5c 100644
--- a/security/py-fail2ban/files/fail2ban.in
+++ b/security/py-fail2ban/files/fail2ban.in
@@ -7,6 +7,9 @@
 # Add the following lines to /etc/rc.conf to enable fail2ban:
 # fail2ban_enable="YES"
 # fail2ban_flags="<set as needed>"
+# fail2ban_pidfile="<same as in fail2ban.local>"
+
+# Make sure pidfile and socket point to the same directory
 
 . /etc/rc.subr
 
@@ -15,12 +18,18 @@ PATH=${PATH}:%%PREFIX%%/sbin:%%PREFIX%%/bin
 name="fail2ban"
 rcvar=fail2ban_enable
 
+start_precmd="fail2ban_prestart"
 command="%%PREFIX%%/bin/fail2ban-server"
 command_interpreter="%%PYTHON_CMD%%"
 client="%%PREFIX%%/bin/fail2ban-client"
 
 extra_commands="reload jailstatus"
 
+fail2ban_prestart()
+{
+   install -d -m 0755 "$(dirname ${pidfile})"
+}
+
 load_rc_config ${name}
 
 #