CVS commit: pkgsrc/security/fail2ban

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jul  8 22:10:29 UTC 2022

Modified Files:
        pkgsrc/security/fail2ban: Makefile PLIST

Log Message:
fail2ban: restrict to python3


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/security/fail2ban/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/fail2ban/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/fail2ban/Makefile
diff -u pkgsrc/security/fail2ban/Makefile:1.19 pkgsrc/security/fail2ban/Makefile:1.20
--- pkgsrc/security/fail2ban/Makefile:1.19      Thu Jun 30 11:18:46 2022
+++ pkgsrc/security/fail2ban/Makefile   Fri Jul  8 22:10:29 2022
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/06/30 11:18:46 nia Exp $
-#
+# $NetBSD: Makefile,v 1.20 2022/07/08 22:10:29 wiz Exp $
 
 DISTNAME=      fail2ban-0.11.2
 PKGREVISION=   2
@@ -14,8 +13,9 @@ LICENSE=      gnu-gpl-v2
 DEPENDS+=      ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-numpydoc-[0-9]*:../../textproc/py-numpydoc
+BUILD_DEPENDS+=        ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 
-PYTHON_VERSIONED_DEPENDENCIES= sphinx:build
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 USE_TOOLS+=    make:build
 
@@ -102,9 +102,7 @@ post-extract:
        ${CP} ${FILESDIR}/paths-pkgsrc.conf ${WRKSRC}/config/paths-pkgsrc.conf
 
 pre-patch:
-.if "${PYTHON_VERSION_DEFAULT}" != "27"
        cd ${WRKSRC}/ && ${PREFIX}/bin/2to3-${PYVERSSUFFIX} --no-diffs --write --nobackups --fix=all bin/* fail2ban
-.endif
 
 post-build:
        cd ${WRKSRC}/doc/ && make SPHINXBUILD=${PREFIX}/bin/sphinx-build-${PYVERSSUFFIX} text
@@ -126,5 +124,4 @@ post-install:
 .include "options.mk"
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/fail2ban/PLIST
diff -u pkgsrc/security/fail2ban/PLIST:1.7 pkgsrc/security/fail2ban/PLIST:1.8
--- pkgsrc/security/fail2ban/PLIST:1.7  Mon Jan 10 08:14:30 2022
+++ pkgsrc/security/fail2ban/PLIST      Fri Jul  8 22:10:29 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2022/01/10 08:14:30 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2022/07/08 22:10:29 wiz Exp $
 bin/fail2ban-client
 bin/fail2ban-python
 bin/fail2ban-regex
@@ -596,7 +596,3 @@ share/examples/fail2ban/paths-netbsd.con
 share/examples/fail2ban/paths-opensuse.conf
 share/examples/fail2ban/paths-osx.conf
 share/examples/fail2ban/paths-pkgsrc.conf
-@pkgdir share/examples/fail2ban/jail.d
-@pkgdir share/examples/fail2ban/fail2ban.d
-@pkgdir etc/fail2ban/filter.d/ignorecommands
-@pkgdir etc/fail2ban/action.d