From nobody Wed Sep 18 16:58:04 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 4X84bJ65lDz5WpH1; Wed, 18 Sep 2024 16:58:04 +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 4X84bJ5bMbz4Wfh; Wed, 18 Sep 2024 16:58:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726678684; 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=OQ/sqTm5fbFTtLPzIR1KyX3mIieWa05VRFQtgxVUxqc=; b=Feg9yjWQd1EMQsGNduwHQ9f6NOJwo1TM3ju8F2tp2TgQbOfsU4OLfoRYwSqJpoYDMSURxN X6+0wD36pwu1k0YdJ9bMqMIn9wFSEoh8nmPzDephYFVvA84H9AqknEqqxpsmptHmyIlRDG wRq2ia0WWaINrp8N48HhuNpuCBPQiHmU0c14IxykzeAL3fQ+3JPxZa6kW8ridC1D+hm/0R vsckW24sjUQBfXtS++afEgGoHf+QCa0nYGENJggXP19sq/tk/YgtQP9yFN0lg3LIFSGK3a MxYR+EziXDn8qgdg9L3vitONpZAbxdE5qlrky+tHBduLNPrYSxLtFIpVXH4RBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726678684; a=rsa-sha256; cv=none; b=J/rDG1pHWPF7OUI9ST+jyB6pRndMYK05nuxq9yZZCg4lNLF+ZgyOaSgZgaU8yB/B6tqXcP TrSXErLt835LfpsN64d94OqKJvLs8IlLSYwozT1FpZW8+oeZ1n9wIu4zkmikdFd3tsIABF KADu2kM2oYKDniBJCauXmyz3BTab2yLoHzEWIYltm+qrWCwbg5BNdZSGNTnBNjEp8z166i bGSIxGo6YUenXzGu0obtAh5n53iPTvx7hrn960rdnaQAzIiQclHpmPlGljX50+2ojbIKFf e1B7ENQsDZ/W/aYMNoAmgssgXlt0VzSVf2EeGlJO8jDzzZpdwGqR4kpVwIEOZg== 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=1726678684; 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=OQ/sqTm5fbFTtLPzIR1KyX3mIieWa05VRFQtgxVUxqc=; b=FKBic+Uc4XPHzj27QX4E97V9Q59bej+etIJmK0mexS1gNYCPLF9WAGcLXWx4Pqbj307yQF Q/oikV7e6NHUPhtEeCbRHYcniTdJBxci732ZZcn/zH9cBjDRrp7tBMaLf6MCGTkDYQnnTz U5vF3zOA17JFNAcK9trIMjOetOHkOx32Eq/N9937E3wAut4dnbDlcixUFielCKYL3kjI5L NEQSek6RBFzHEtV7GTHPHp5hcEpkZLqAhZ8Lo5uYtbPm/TNWm9viAcrEobfiyQ8wP+k5jN 0e11IlCOlx8zgWt70WwW1IPsf4jSDgIwk36YUtIzfGMed/8ifiAGa5BorCF6oA== 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 4X84bJ4qbSzVkD; Wed, 18 Sep 2024 16:58:04 +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 48IGw4ZH041955; Wed, 18 Sep 2024 16:58:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48IGw49l041952; Wed, 18 Sep 2024 16:58:04 GMT (envelope-from git) Date: Wed, 18 Sep 2024 16:58:04 GMT Message-Id: <202409181658.48IGw49l041952@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexander Leidinger Subject: git: 858c9f19409a - main - security/crowdsec: update to 1.6.3 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: netchild X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 858c9f19409af3496757ff8c02f46635744caa8a Auto-Submitted: auto-generated The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/ports/commit/?id=858c9f19409af3496757ff8c02f46635744caa8a commit 858c9f19409af3496757ff8c02f46635744caa8a Author: marco AuthorDate: 2024-09-18 16:57:25 +0000 Commit: Alexander Leidinger CommitDate: 2024-09-18 16:58:01 +0000 security/crowdsec: update to 1.6.3 PR: 281454 --- security/crowdsec/Makefile | 7 ++----- security/crowdsec/distinfo | 10 +++++----- security/crowdsec/files/crowdsec.in | 14 +++++++++++--- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/security/crowdsec/Makefile b/security/crowdsec/Makefile index e9a2217fd982..538e98c54a04 100644 --- a/security/crowdsec/Makefile +++ b/security/crowdsec/Makefile @@ -1,9 +1,6 @@ PORTNAME= crowdsec DISTVERSIONPREFIX= v -DISTVERSION= 1.6.2 -# the remote tag was moved for 1.6.2, so we force another tag to avoid the version on proxy.golang.org -DISTVERSIONSUFFIX= -final -PORTREVISION= 4 +DISTVERSION= 1.6.3 CATEGORIES= security MAINTAINER= marco@crowdsec.net @@ -17,7 +14,7 @@ LIB_DEPENDS= libabsl_base.so:devel/abseil \ libre2.so:devel/re2 USES= go:1.22,modules pkgconfig -_COMMIT= 16bfab86 +_COMMIT= 4851945a _BUILD_DATE= $$(date -u "+%F_%T") USE_RC_SUBR= crowdsec diff --git a/security/crowdsec/distinfo b/security/crowdsec/distinfo index fc31557d4e7f..4477491deabe 100644 --- a/security/crowdsec/distinfo +++ b/security/crowdsec/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1717420493 -SHA256 (go/security_crowdsec/crowdsec-v1.6.2-final/v1.6.2-final.mod) = 0cd8f4a237f0901164c8d80fa76c6bc7354054e867c7719c9691f4e5ae4b4a31 -SIZE (go/security_crowdsec/crowdsec-v1.6.2-final/v1.6.2-final.mod) = 10156 -SHA256 (go/security_crowdsec/crowdsec-v1.6.2-final/v1.6.2-final.zip) = e07898b78bd6ff09a1913b7cb8f69b6c3dd3c2add5b4554cc5b8084c91eb96ff -SIZE (go/security_crowdsec/crowdsec-v1.6.2-final/v1.6.2-final.zip) = 1505724 +TIMESTAMP = 1725967354 +SHA256 (go/security_crowdsec/crowdsec-v1.6.3/v1.6.3.mod) = d47b370bc889d0484778cfbfc610b4254d6724455fb57f1fc6b3cb080d2343cd +SIZE (go/security_crowdsec/crowdsec-v1.6.3/v1.6.3.mod) = 10157 +SHA256 (go/security_crowdsec/crowdsec-v1.6.3/v1.6.3.zip) = 9be326fa2feb5efc612a23c7309e4b6e3ca697876dbde1555c7e578f099c3eac +SIZE (go/security_crowdsec/crowdsec-v1.6.3/v1.6.3.zip) = 1581062 diff --git a/security/crowdsec/files/crowdsec.in b/security/crowdsec/files/crowdsec.in index ba0a40a19250..42abf1d829eb 100644 --- a/security/crowdsec/files/crowdsec.in +++ b/security/crowdsec/files/crowdsec.in @@ -42,6 +42,10 @@ stop_precmd="${name}_stop_precmd" stop_postcmd="${name}_stop_postcmd" extra_commands="configtest reload" +# If the crowdsec process was not started or is in a fail loop due to misconfiguration, +# the TERM signal is not enough to terminate /usr/sbin/daemon. +sig_stop="INT" + crowdsec_stop_precmd() { # take note of the pid, because sbin/daemon will remove the file # without waiting for crowdsec to exit @@ -84,9 +88,13 @@ crowdsec_precmd() { fi fi - # install the collection for the first time, or if it has been removed - cs_cli collections inspect crowdsecurity/freebsd --no-metrics 2>/dev/null | grep ^installed | grep -q true || \ - cs_cli collections install crowdsecurity/freebsd || : + # 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 + cs_cli parsers install crowdsecurity/whitelists --error || : + cs_cli collections install crowdsecurity/freebsd --error || : + fi } crowdsec_configtest() {