Index: branches/2020Q4/security/py-fail2ban/Makefile
===================================================================
--- branches/2020Q4/security/py-fail2ban/Makefile	(revision 552920)
+++ branches/2020Q4/security/py-fail2ban/Makefile	(revision 552921)
@@ -1,90 +1,94 @@
 # $FreeBSD$
 
 PORTNAME=	fail2ban
 PORTVERSION=	0.11.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+PATCHFILES=	55e76c0b807e87f6a04d459bb9c59da33c98572b.patch:-p1 \
+		9d7388e68448e9294e568a8ad21599e719c914b0.patch:-p1
+PATCH_SITES=	https://github.com/fail2ban/fail2ban/commit/
 
 MAINTAINER=	theis@gmx.at
 COMMENT=	Scans log files and bans IP that makes too many password failures
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
 USES=		python:patch shebangfix
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist distutils
 USE_RC_SUBR=	fail2ban
 
 NO_ARCH=	yes
 
 SHEBANG_FILES=	config/filter.d/ignorecommands/apache-fakegooglebot
 SHEBANG_LANG=	fail2ban-python
 
 SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
 
 PYDISTUTILS_INSTALLARGS+=	--install-data=${ETCDIR} --without-test
 
 PORTDOCS=	README.md DEVELOP
 
 OPTIONS_DEFINE=	DOCS INOTIFY
 OPTIONS_DEFAULT=INOTIFY
 
 INOTIFY_DESC=		Support for (lib)inotify to monitor filesystem changes
 
 INOTIFY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyinotify>=0.8.3:devel/py-pyinotify@${PY_FLAVOR}
 
 FILES=		${WRKSRC}/bin/fail2ban-client \
 		${WRKSRC}/fail2ban/client/configreader.py \
 		${WRKSRC}/fail2ban/client/fail2bancmdline.py \
 		${WRKSRC}/fail2ban/client/fail2banregex.py \
 		${WRKSRC}/man/fail2ban-client.1 \
 		${WRKSRC}/man/fail2ban-client.h2m \
 		${WRKSRC}/setup.py
 
 MAN_FILES=	${WRKSRC}/man/fail2ban-client.1 \
 		${WRKSRC}/man/fail2ban-client.h2m \
 		${WRKSRC}/man/fail2ban-regex.1 \
 		${WRKSRC}/man/fail2ban-server.1 \
 		${WRKSRC}/man/fail2ban.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' \
 		${WRKSRC}/config/jail.conf
 	@${REINPLACE_CMD} -e 's,/var/lib/fail2ban/,${FAIL2BAN_DBDIR}/,g' \
 		${WRKSRC}/config/fail2ban.conf
 	@${REINPLACE_CMD} -e 's,jail.conf(5),fail2ban-jail.conf(5),g' \
 		${MAN_FILES}
 	@${REINPLACE_CMD} -e 's, sed , ${SED} ,g' \
 		${WRKSRC}/config/action.d/hostsdeny.conf
 
 .	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
 	${INSTALL_MAN} ${WRKSRC}/man/${file}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/man/jail.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5/fail2ban-jail.conf.5
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.post.mk>
Index: branches/2020Q4/security/py-fail2ban/distinfo
===================================================================
--- branches/2020Q4/security/py-fail2ban/distinfo	(revision 552920)
+++ branches/2020Q4/security/py-fail2ban/distinfo	(revision 552921)
@@ -1,3 +1,7 @@
-TIMESTAMP = 1578911137
+TIMESTAMP = 1602718222
 SHA256 (fail2ban-fail2ban-0.11.1_GH0.tar.gz) = 71d2a52b66bb0f87ac3812246bdd3819ec561913cd44afd39130a342f043aa6d
 SIZE (fail2ban-fail2ban-0.11.1_GH0.tar.gz) = 538660
+SHA256 (55e76c0b807e87f6a04d459bb9c59da33c98572b.patch) = 9832614d10f1cf0d45fa0bae62e69dda06934758582a4beebbe9755040b51cfa
+SIZE (55e76c0b807e87f6a04d459bb9c59da33c98572b.patch) = 847
+SHA256 (9d7388e68448e9294e568a8ad21599e719c914b0.patch) = eb0a708146135acf4b9bf3e3238de6dc74e1512c64debff6282f4eaf62cd22e1
+SIZE (9d7388e68448e9294e568a8ad21599e719c914b0.patch) = 2148
Index: branches/2020Q4
===================================================================
--- branches/2020Q4	(revision 552920)
+++ branches/2020Q4	(revision 552921)

Property changes on: branches/2020Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r552920