Index: head/security/py-fail2ban/Makefile =================================================================== --- head/security/py-fail2ban/Makefile (revision 451845) +++ head/security/py-fail2ban/Makefile (revision 451846) @@ -1,71 +1,73 @@ # $FreeBSD$ PORTNAME= fail2ban -PORTVERSION= 0.9.7 +PORTVERSION= 0.10.0 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 OPTIONS_DEFINE= DOCS USES= python 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} 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} 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 451845) +++ head/security/py-fail2ban/distinfo (revision 451846) @@ -1,3 +1,3 @@ -TIMESTAMP = 1496237420 -SHA256 (fail2ban-fail2ban-0.9.7_GH0.tar.gz) = 2817eb0d4f670bef2a79a5a9cfb824b41a4445f5a92a307a453ac95f497c7440 -SIZE (fail2ban-fail2ban-0.9.7_GH0.tar.gz) = 356374 +TIMESTAMP = 1502542383 +SHA256 (fail2ban-fail2ban-0.10.0_GH0.tar.gz) = 3517b68bff71924f179609eb51dd2fe66d78653646528cdf8edf2370ff047c80 +SIZE (fail2ban-fail2ban-0.10.0_GH0.tar.gz) = 459813 Index: head/security/py-fail2ban/files/patch-fail2ban_server_ipdns.py =================================================================== --- head/security/py-fail2ban/files/patch-fail2ban_server_ipdns.py (nonexistent) +++ head/security/py-fail2ban/files/patch-fail2ban_server_ipdns.py (revision 451846) @@ -0,0 +1,19 @@ +--- fail2ban/server/ipdns.py.orig 2017-08-09 14:53:05 UTC ++++ fail2ban/server/ipdns.py +@@ -69,10 +69,14 @@ class DNSUtils: + for fam, ipfam in ((socket.AF_INET, IPAddr.FAM_IPv4), (socket.AF_INET6, IPAddr.FAM_IPv6)): + try: + for result in socket.getaddrinfo(dns, None, fam, 0, socket.IPPROTO_TCP): +- ip = IPAddr(result[4][0], ipfam) ++ # if getaddrinfo returns something unexpected: ++ if len(result) < 4 or not len(result[4]): continue ++ # be sure we have an ip-string ++ # some return an integer there ++ ip = IPAddr(str(result[4][0]), ipfam) + if ip.isValid: + ips.append(ip) +- except socket.error as e: ++ except Exception as e: + saveerr = e + if not ips and saveerr: + logSys.warning("Unable to find a corresponding IP address for %s: %s", dns, saveerr) Property changes on: head/security/py-fail2ban/files/patch-fail2ban_server_ipdns.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 Index: head/security/py-fail2ban/pkg-message =================================================================== --- head/security/py-fail2ban/pkg-message (revision 451845) +++ head/security/py-fail2ban/pkg-message (revision 451846) @@ -1,16 +1,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Please do not edit the fail2ban.conf and jail.conf files as they -will be overwritten upon each upgrade of the port. +Please do not edit the fail2ban.conf, jail.conf, or any other +files in the distributen as they will be overwritten upon each +upgrade of the port. Instead, create new files named *.local e.g. +fail2ban.local or jail.local. -Instead, create new files named fail2ban.local and jail.local - For more information, see the official manual: - http://www.fail2ban.org/wiki/index.php/MANUAL_0_8#Configuration -If you are upgrading from 0.8.x consider adopting the new -configuration style. +If you have custom filters or actions and you are upgrading from +0.9.x please check them. + +Users of pf: please note that instead of +action = pf +you hae to write someting like +action = pf[port={80 443}, name=http] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -