Index: head/security/py-fail2ban/Makefile =================================================================== --- head/security/py-fail2ban/Makefile (revision 466873) +++ head/security/py-fail2ban/Makefile (revision 466874) @@ -1,82 +1,82 @@ # $FreeBSD$ PORTNAME= fail2ban -PORTVERSION= 0.10.2 +PORTVERSION= 0.10.3 CATEGORIES= security python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} 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@${FLAVOR} OPTIONS_DEFINE= DOCS 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} PORTDOCS= README.md DEVELOP 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 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} . 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 Index: head/security/py-fail2ban/distinfo =================================================================== --- head/security/py-fail2ban/distinfo (revision 466873) +++ head/security/py-fail2ban/distinfo (revision 466874) @@ -1,3 +1,3 @@ -TIMESTAMP = 1516358804 -SHA256 (fail2ban-fail2ban-0.10.2_GH0.tar.gz) = 1c1a969137c56f7e8b90e5f14d78b80214d34d67209787bfddc8d5804ceb29cc -SIZE (fail2ban-fail2ban-0.10.2_GH0.tar.gz) = 474624 +TIMESTAMP = 1523170020 +SHA256 (fail2ban-fail2ban-0.10.3_GH0.tar.gz) = 92ee35ec131f0005964f6794f69a9207827b428dd05877a6eacee584c5c11642 +SIZE (fail2ban-fail2ban-0.10.3_GH0.tar.gz) = 485453 Index: head/security/py-fail2ban/files/patch-fail2ban_client_csocket.py =================================================================== --- head/security/py-fail2ban/files/patch-fail2ban_client_csocket.py (nonexistent) +++ head/security/py-fail2ban/files/patch-fail2ban_client_csocket.py (revision 466874) @@ -0,0 +1,34 @@ +--- fail2ban/client/csocket.py.orig 2018-04-08 10:28:39.135695000 +0200 ++++ fail2ban/client/csocket.py 2018-04-08 10:35:39.403548000 +0200 +@@ -43,7 +43,7 @@ + self.__csock.connect(sock) + + def __del__(self): +- self.close(False) ++ self.close() + + def send(self, msg, nonblocking=False, timeout=None): + # Convert every list member to string +@@ -56,13 +56,18 @@ + def settimeout(self, timeout): + self.__csock.settimeout(timeout if timeout != -1 else self.__deftout) + +- def close(self, sendEnd=True): ++ def close(self): + if not self.__csock: + return +- if sendEnd: ++ try: + self.__csock.sendall(CSPROTO.CLOSE + CSPROTO.END) +- self.__csock.shutdown(socket.SHUT_RDWR) +- self.__csock.close() ++ self.__csock.shutdown(socket.SHUT_RDWR) ++ except socket.error: # pragma: no cover - normally unreachable ++ pass ++ try: ++ self.__csock.close() ++ except socket.error: # pragma: no cover - normally unreachable ++ pass + self.__csock = None + + @staticmethod Property changes on: head/security/py-fail2ban/files/patch-fail2ban_client_csocket.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property