fail2ban: fix build with latest setuptools.

Fixes PR 56572 by nia@

Fix pkglint while here.

3 files changed, 27 insertions, 12 deletions

diff --git a/security/fail2ban/Makefile b/security/fail2ban/Makefile
index 77ae1dd5ed6..3c6b11788fb 100644
--- a/security/fail2ban/Makefile
+++ b/security/fail2ban/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2021/10/16 19:37:01 tm Exp $
+# $NetBSD: Makefile,v 1.17 2021/12/23 22:27:35 wiz Exp $
 #
 
 DISTNAME=	fail2ban-0.11.2
@@ -57,14 +57,14 @@ RCD_SCRIPTS=		fail2ban
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	pre-configure
 SUBST_MESSAGE.paths=	Substituting paths variables.
-SUBST_FILES.paths=	${WRKSRC}/fail2ban/client/*.py
-SUBST_FILES.paths+=	${WRKSRC}/fail2ban/tests/utils.py
-SUBST_FILES.paths+=	${WRKSRC}/man/fail2ban-client.1
-SUBST_FILES.paths+=	${WRKSRC}/man/fail2ban-client.h2m
-SUBST_FILES.paths+=	${WRKSRC}/setup.py
-SUBST_FILES.paths+=	${WRKSRC}/config/fail2ban.conf
-SUBST_FILES.paths+=	${WRKSRC}/config/jail.conf
-SUBST_FILES.paths+=	${WRKSRC}/config/paths-pkgsrc.conf
+SUBST_FILES.paths=	fail2ban/client/*.py
+SUBST_FILES.paths+=	fail2ban/tests/utils.py
+SUBST_FILES.paths+=	man/fail2ban-client.1
+SUBST_FILES.paths+=	man/fail2ban-client.h2m
+SUBST_FILES.paths+=	setup.py
+SUBST_FILES.paths+=	config/fail2ban.conf
+SUBST_FILES.paths+=	config/jail.conf
+SUBST_FILES.paths+=	config/paths-pkgsrc.conf
 SUBST_SED.paths=	-e 's,/etc,${PREFIX}/etc,g'
 SUBST_SED.paths+=	-e 's,/var/lib,${VARBASE}/db,g'
 SUBST_SED.paths+=	-e 's,/var,${VARBASE},g'
@@ -75,7 +75,7 @@ SUBST_VARS.paths=	VARBASE
 SUBST_CLASSES+=		install
 SUBST_STAGE.install=	pre-install
 SUBST_MESSAGE.install=	correcting installation path
-SUBST_FILES.install=	${WRKSRC}/setup.py
+SUBST_FILES.install=	setup.py
 SUBST_SED.install=	-e 's,${PREFIX}/etc/fail2ban,${EGDIR},g'
 
 .include "../../mk/bsd.prefs.mk"
@@ -83,7 +83,7 @@ SUBST_SED.install=	-e 's,${PREFIX}/etc/fail2ban,${EGDIR},g'
 SUBST_CLASSES+=		ostype
 SUBST_STAGE.ostype=	post-configure
 SUBST_MESSAGE.ostype=	Adjusting OS type
-SUBST_FILES.ostype=	${WRKSRC}/config/paths-pkgsrc.conf
+SUBST_FILES.ostype=	config/paths-pkgsrc.conf
 .if ${OPSYS} == "NetBSD"
 SUBST_SED.ostype=	-e "s,\#before = paths-distro.conf,before = paths-netbsd.conf,g"
 .elif ${OPSYS} == "Darwin"
diff --git a/security/fail2ban/distinfo b/security/fail2ban/distinfo
index 7f44a9cfb14..46cc25d7507 100644
--- a/security/fail2ban/distinfo
+++ b/security/fail2ban/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 11:17:05 nia Exp $
+$NetBSD: distinfo,v 1.9 2021/12/23 22:27:35 wiz Exp $
 
 BLAKE2s (fail2ban-0.11.2.tar.gz) = ae6f306141cbf8b9f92b0561771e4bb1a559049b4f583774232c2dbae4e5aedc
 SHA512 (fail2ban-0.11.2.tar.gz) = 46b27abd947b00ea64106dbac563ef8afef38eec86684024d47d9a0e8c1969ff864ad6df7f4f8de2aa3eb1af6d769fb6796592d9f0e35521d5f95f17b8cade97
 Size (fail2ban-0.11.2.tar.gz) = 559552 bytes
 SHA1 (patch-doc_Makefile) = b17d28b1ef79b0cf86e4cd5d6eaa3e3d1bc2da39
+SHA1 (patch-setup.py) = 7e3e3ae3101b71413e563656334897814bf7fbad
diff --git a/security/fail2ban/patches/patch-setup.py b/security/fail2ban/patches/patch-setup.py
new file mode 100644
index 00000000000..e6e961ddc7a
--- /dev/null
+++ b/security/fail2ban/patches/patch-setup.py
@@ -0,0 +1,14 @@
+$NetBSD: patch-setup.py,v 1.1 2021/12/23 22:27:35 wiz Exp $
+
+Compatibility with latest setuptools.
+
+--- setup.py.orig	2021-12-23 22:23:32.219701295 +0000
++++ setup.py
+@@ -186,7 +186,6 @@ commands.'''
+ if setuptools:
+ 	setup_extra = {
+ 		'test_suite': "fail2ban.tests.utils.gatherTests",
+-		'use_2to3': True,
+ 	}
+ else:
+ 	setup_extra = {}