From nobody Fri Sep 20 21:17:29 2024 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 4X9QFj4KL4z5X735; Fri, 20 Sep 2024 21:17:29 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X9QFj25DBz4p7b; Fri, 20 Sep 2024 21:17:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726867049; 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=a+YSj4SJKqt1BZ+4Op642Kdnx6YfBZQ6VLZaRmqexfM=; b=fL6Bj0YmjPKkUqbHP+seu6LXEIxVomhwazuj+BkrDlb0IrWZrevsYd3X0w8zVQFuy22I3M gyFlDv3gCLWUqcE9Ycj6/3IppYV9qG/luNfDyV0WYeR3iYm9SuUelRPOJMzIRHoe+SiUI3 cBokAJNU27OxXFWKn/GE1JHZL4kVCTQfnRGFyCJwNmjPQVHkQmeBTuoHLUshFgrTtA1CNt 3KfzNlAIcumFSNSMg2nBAajWUauyGKH7eyUgQgDnCvpG029iHDKzxXSyepcO3UHCuCcv88 yvg5bOOFUG3U88B0aJLPdM3Tor1WRRQWLmgZNF/hU1ImRcLCMUVMD8AGVOb8ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726867049; a=rsa-sha256; cv=none; b=dDDPthd3Q7MwccFJLAvS/BvhOQ4Yybx1e8wWu0Uxa/AcrJEDWxW4XpXpsi8/z9p7ZGgdyv ko92LlskwQaSY0icP84NpfP4ih+Ni3IC65f7o97/mOMfaooHYejlUGDSwn1NC+vOJOQ5PN sWy5dCt+TOkw5BM5dfcKhQPHUhAdsAAR39aLmO5LAeqecjsMWAOTrYSGVXZjBIA7Eg48Fk KikSkq+c0+cIDQTBe5n8G4WsGjSVNIzwLCFdc1wUue6T/m4gPxY4gulbtBxj/zKhhhBlHF G7yif4kUqRmqoJ7jvpNXbuzFn67y0Pb63+c6eJjxA0ef6glWQEb7RGDjt3HIZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726867049; 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=a+YSj4SJKqt1BZ+4Op642Kdnx6YfBZQ6VLZaRmqexfM=; b=o7Ty2ps8obgZcpuDhH7ViIdHN31Yv7swcWaski7sMS7DEdYVRyToMtiweyNOZdZy2bSJcQ Bsfmm5XDxedl7VFh4EUSjGHIFjTdF/taFimcmPSFoTe05tvJLNZL5D2RAPUpnr0VyCocd7 lMq8oqG+/keBocGpIKuGW49JNXrLJBsJLLHnrr/T4cDU/HQBaG/tvLxPke1fi8vlro6P25 GT5STs7yGzOTNmztfsRfkvtbSLs1ogyLOjyPgobY8IbteOrcavtJzf7p4sgPWgtUUmmZzq +WR4sGmcY+YfS4SNRwdLdp6S0yR/U7wc45CZMfu8wOsk+X4eJbD+oAsZ7UFWJQ== 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 4X9QFj1hQRz15Hv; Fri, 20 Sep 2024 21:17:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48KLHT1S095697; Fri, 20 Sep 2024 21:17:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48KLHTtR095694; Fri, 20 Sep 2024 21:17:29 GMT (envelope-from git) Date: Fri, 20 Sep 2024 21:17:29 GMT Message-Id: <202409202117.48KLHTtR095694@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 2ba0d51ff6a6 - main - security/crowdsec: fix "command not found" on install script 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ba0d51ff6a6322fa134f7cf77ea004b8a1e78cc Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ba0d51ff6a6322fa134f7cf77ea004b8a1e78cc commit 2ba0d51ff6a6322fa134f7cf77ea004b8a1e78cc Author: marco AuthorDate: 2024-09-20 21:13:59 +0000 Commit: Vladimir Druzenko CommitDate: 2024-09-20 21:17:22 +0000 security/crowdsec: fix "command not found" on install script A command is called which is not on $PATH, this fixes it by calling a wrapper that also provides the (possibly custom) configuration path. PR: 281608 Fixes: 858c9f19409a (update to 1.6.3) --- security/crowdsec/Makefile | 1 + security/crowdsec/files/crowdsec.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/security/crowdsec/Makefile b/security/crowdsec/Makefile index 538e98c54a04..48f864e77d2a 100644 --- a/security/crowdsec/Makefile +++ b/security/crowdsec/Makefile @@ -1,6 +1,7 @@ PORTNAME= crowdsec DISTVERSIONPREFIX= v DISTVERSION= 1.6.3 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= marco@crowdsec.net diff --git a/security/crowdsec/files/crowdsec.in b/security/crowdsec/files/crowdsec.in index 42abf1d829eb..5e827add0062 100644 --- a/security/crowdsec/files/crowdsec.in +++ b/security/crowdsec/files/crowdsec.in @@ -91,7 +91,7 @@ crowdsec_precmd() { # If the hub is empty, install the freebsd collection and the private ip whitelist. # We don't ship the whitelist in the collection because # there are legitimate use cases for banning private ip ranges. - if [ "$(cscli hub list -o raw | wc -l)" -le 1 ]; then + if [ "$(cs_cli hub list -o raw | wc -l)" -le 1 ]; then cs_cli parsers install crowdsecurity/whitelists --error || : cs_cli collections install crowdsecurity/freebsd --error || : fi