From nobody Mon Jun 12 22:11:18 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qg5Vt3m6Lz4dXR0; Mon, 12 Jun 2023 22:11:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qg5Vt3Lc0z4Kyk; Mon, 12 Jun 2023 22:11:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686607878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=962/PkpDdYFEtfk/AxFVcwGEv5YMiEs1VeoZNfMCr0U=; b=u28e4ZHPR+CpAjpN76GMFqTWRNunoPf/+JpQnr8Qw3Lr/Asx5gx6+JtA5iQNY5DSp7odZA DFeLRLIgZqkt2z92a1QfgvHndsKsxdMInj4CXgFwA3l4PIC9QpxE96Nl1ZmEAp9DLtDYZQ XGjDZRjBz7UdxotWUiK/sYkVEnOIeMPh+uXhdBzvz/T37I30HO4nlEoYZ+PmFCjPvwzpK1 jKQ8ZvW9ApK22WbEWeIXnvrsXBL+SC7G8yrFnKjpw5jwYwPcKRjbJJAeXI22XTiHsGammv jx5MXsdwStNVzl72y0hcIe1IRvJFbeKaExYafR2A3Qzzd2+0jzbOb2RUr1eTwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686607878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=962/PkpDdYFEtfk/AxFVcwGEv5YMiEs1VeoZNfMCr0U=; b=k4/nZzPZdkpRfx55jBVDhpVXaFM59WTfVf7Woa7qMu/al/vdqht5rkvGNPpFsWRtFV0qXn 757O//xj7N0aJfHyKjb77Uz9VqWr0f8RvkMsVKbsfYoxqlkrUhWOlYOaw5yN6ZaTQNwwa8 v4dZoIqWu0iBcWVtEzz1RBDmPM0ULR1yLmgeYYghzTHvPjzwD9y59VibNGScX2MMY1l1Hf jE2S6bqSm0P7/JB/SHdpTr+5N7dV9+WcC1MDn5IwRnCDEZzlNgtx9fh/t+SuKXgpLSJas7 54Be8JU+K+elKhSpHurEVEp1lUAEzFILwgzGDOSJnjKaN2DGzW77XzSp6A8LRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686607878; a=rsa-sha256; cv=none; b=TGOov7P5q6z8126HyV9acQ+6W7DHJEsK/Odw45dA3VSOQzaNX1AF8jOFUFGxUzwIeaTWHr x7Rjtdd9FEKW38/D6T4aKg4v0zCe7LI3KhxRaMdGKuO+Rm+1+adUpjnnxxaVomMqjw6zCE 3nQXYffOfUnCFSmkC/z6j6dXecR9ebfXFGk5nHetjoiO7c2uTQwELUcD8HG7fV8QcE7MWG PG5aQwKcSDKns+6YNiFPu5ooXVfkDUBZC8uL5Y2PEh1qAkz7ZCz7wQZMm4G/q184F8qxuZ hfeochFUUzI1nyj4zrBQlNlyw1JsvNCLTntxr0BEEPjYYKwAwt+sAo27fW1Qlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qg5Vt2RvrzwqX; Mon, 12 Jun 2023 22:11:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35CMBI0H018441; Mon, 12 Jun 2023 22:11:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35CMBIqq018424; Mon, 12 Jun 2023 22:11:18 GMT (envelope-from git) Date: Mon, 12 Jun 2023 22:11:18 GMT Message-Id: <202306122211.35CMBIqq018424@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: 0289bca575e8 - 2023Q2 - security/py-fail2ban: Fix FAIL2BAN_DBDIR List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 0289bca575e831795c0e4c994d154775765b231d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=0289bca575e831795c0e4c994d154775765b231d commit 0289bca575e831795c0e4c994d154775765b231d Author: Cy Schubert AuthorDate: 2023-06-12 22:04:16 +0000 Commit: Cy Schubert CommitDate: 2023-06-12 22:11:09 +0000 security/py-fail2ban: Fix FAIL2BAN_DBDIR FAIL2BAN_DBDIR is a user set option. Unfortunately plist is not updated resulting in plist errors. PR: 271972 (cherry picked from commit 1036c8dcca6e51b2c3dac6b9ebabd42cfc334a90) --- security/py-fail2ban/Makefile | 1 + security/py-fail2ban/pkg-plist | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/security/py-fail2ban/Makefile b/security/py-fail2ban/Makefile index dcc22566019f..1dacfecf45ed 100644 --- a/security/py-fail2ban/Makefile +++ b/security/py-fail2ban/Makefile @@ -47,6 +47,7 @@ MAN_FILES= ${WRKSRC}/man/fail2ban-client.1 \ ${WRKSRC}/man/fail2ban.1 FAIL2BAN_DBDIR= /var/db/${PORTNAME} +PLIST_SUB= FAIL2BAN_DBDIR=${FAIL2BAN_DBDIR} PY2TO3_CMD= ${LOCALBASE}/bin/2to3-${PYTHON_VER} PY2TO3_ARG= --no-diffs --write --nobackups --fix=all diff --git a/security/py-fail2ban/pkg-plist b/security/py-fail2ban/pkg-plist index 9836b30ee195..1709748512dc 100644 --- a/security/py-fail2ban/pkg-plist +++ b/security/py-fail2ban/pkg-plist @@ -6,7 +6,7 @@ man/man5/fail2ban-jail.conf.5.gz bin/fail2ban-python @dir %%ETCDIR%%/fail2ban.d @dir %%ETCDIR%%/jail.d -@dir /var/db/fail2ban +@dir %%FAIL2BAN_DBDIR%% @dir /var/lib/fail2ban @dir /var/lib @dir /var/run/fail2ban