Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 6B01E1A9239 for ; Thu, 23 Dec 2021 22:27:38 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 9C77F84E80; Thu, 23 Dec 2021 22:27:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D87C184CE7 for ; Thu, 23 Dec 2021 22:27:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id ufvLUh0vvai9 for ; Thu, 23 Dec 2021 22:27:36 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 2FFE784CD8 for ; Thu, 23 Dec 2021 22:27:36 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 292B0FAEC; Thu, 23 Dec 2021 22:27:36 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1640298456173910" MIME-Version: 1.0 Date: Thu, 23 Dec 2021 22:27:36 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/security/fail2ban To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20211223222736.292B0FAEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1640298456173910 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Thu Dec 23 22:27:36 UTC 2021 Modified Files: pkgsrc/security/fail2ban: Makefile distinfo Added Files: pkgsrc/security/fail2ban/patches: patch-setup.py Log Message: fail2ban: fix build with latest setuptools. Fixes PR 56572 by nia@ Fix pkglint while here. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 pkgsrc/security/fail2ban/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/fail2ban/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/security/fail2ban/patches/patch-setup.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1640298456173910 Content-Disposition: inline Content-Length: 3656 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/fail2ban/Makefile diff -u pkgsrc/security/fail2ban/Makefile:1.16 pkgsrc/security/fail2ban/Makefile:1.17 --- pkgsrc/security/fail2ban/Makefile:1.16 Sat Oct 16 19:37:01 2021 +++ pkgsrc/security/fail2ban/Makefile Thu Dec 23 22:27:35 2021 @@ -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/f 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" Index: pkgsrc/security/fail2ban/distinfo diff -u pkgsrc/security/fail2ban/distinfo:1.8 pkgsrc/security/fail2ban/distinfo:1.9 --- pkgsrc/security/fail2ban/distinfo:1.8 Tue Oct 26 11:17:05 2021 +++ pkgsrc/security/fail2ban/distinfo Thu Dec 23 22:27:35 2021 @@ -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 Added files: Index: pkgsrc/security/fail2ban/patches/patch-setup.py diff -u /dev/null pkgsrc/security/fail2ban/patches/patch-setup.py:1.1 --- /dev/null Thu Dec 23 22:27:36 2021 +++ pkgsrc/security/fail2ban/patches/patch-setup.py Thu Dec 23 22:27:35 2021 @@ -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 = {} --_----------=_1640298456173910--