pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/fail2ban fail2ban: restrict to python3



details:   https://anonhg.NetBSD.org/pkgsrc/rev/252a7c5fafd2
branches:  trunk
changeset: 381541:252a7c5fafd2
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Jul 08 22:10:29 2022 +0000

description:
fail2ban: restrict to python3

diffstat:

 security/fail2ban/Makefile |  9 +++------
 security/fail2ban/PLIST    |  6 +-----
 2 files changed, 4 insertions(+), 11 deletions(-)

diffs (54 lines):

diff -r 27578f214d08 -r 252a7c5fafd2 security/fail2ban/Makefile
--- a/security/fail2ban/Makefile        Fri Jul 08 22:07:33 2022 +0000
+++ b/security/fail2ban/Makefile        Fri Jul 08 22:10:29 2022 +0000
@@ -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 @@
 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 @@
        ${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 @@
 .include "options.mk"
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 27578f214d08 -r 252a7c5fafd2 security/fail2ban/PLIST
--- a/security/fail2ban/PLIST   Fri Jul 08 22:07:33 2022 +0000
+++ b/security/fail2ban/PLIST   Fri Jul 08 22:10:29 2022 +0000
@@ -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-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



Home | Main Index | Thread Index | Old Index