security/py-fail2ban: sync with upstream

Taken from: HardenedBSD
carystudio · Jan 23, 2018 · a489e93 · a489e93
1 parent 9520395
commit a489e93
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 26 deletions.
diff --git a/security/py-fail2ban/Makefile b/security/py-fail2ban/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	fail2ban
-PORTVERSION=	0.10.1
-PORTREVISION=	1
+PORTVERSION=	0.10.2
 CATEGORIES=	security python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -48,6 +47,11 @@ MAN_FILES=	${WRKSRC}/man/fail2ban-client.1 \
 
 FAIL2BAN_DBDIR=	/var/db/${PORTNAME}
 
+PY2TO3_CMD=	${LOCALBASE}/bin/2to3-${PYTHON_VER}
+PY2TO3_ARG=	--no-diffs --write --nobackups --fix=all
+
+.include <bsd.port.pre.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,/etc/fail2ban,${ETCDIR},g' ${FILES}
 	@${REINPLACE_CMD} -e 's,paths-debian.conf,paths-freebsd.conf,g' \
@@ -57,6 +61,10 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,jail.conf(5),fail2ban-jail.conf(5),g' \
 		${MAN_FILES}
 
+.	if ${PYTHON_MAJOR_VER} >= 3
+		(cd ${WRKSRC}/ && ${PY2TO3_CMD} ${PY2TO3_ARG} bin/* fail2ban)
+.	endif
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${FAIL2BAN_DBDIR} ${STAGEDIR}/var/run/fail2ban
 .for file in fail2ban-client fail2ban-regex fail2ban-server fail2ban
@@ -71,4 +79,4 @@ post-install-DOCS-on:
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/py-fail2ban/distinfo b/security/py-fail2ban/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508093600
-SHA256 (fail2ban-fail2ban-0.10.1_GH0.tar.gz) = 19bac652e50f35b3b58ea010c2b89b91b945365d37dbf17467e0dc345c058465
-SIZE (fail2ban-fail2ban-0.10.1_GH0.tar.gz) = 465156
+TIMESTAMP = 1516358804
+SHA256 (fail2ban-fail2ban-0.10.2_GH0.tar.gz) = 1c1a969137c56f7e8b90e5f14d78b80214d34d67209787bfddc8d5804ceb29cc
+SIZE (fail2ban-fail2ban-0.10.2_GH0.tar.gz) = 474624
diff --git a/security/py-fail2ban/files/patch-config_action.d_pf.conf b/security/py-fail2ban/files/patch-config_action.d_pf.conf