From nobody Sun Jan 28 14:26:50 2024 X-Original-To: dev-commits-ports-main@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 4TNDJp5cvRz58gNK; Sun, 28 Jan 2024 14:26:50 +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 4TNDJp59yCz3y5P; Sun, 28 Jan 2024 14:26:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706452010; 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=bqjU4AKJKU8oV4HyMrSq2ODmA+IWo/9vQVmvGWWEqlo=; b=L90fI586PzYa8pgwayrs94ARQ2oYAtaxcmKEISsX9oWtyGm0N31pTNSW/qvTqQjzpCn+yu pemS47/GAQPbvkASJkHaxyckvlupXmw/OrxFN9tvkhPN81ca1hnP5Qk44AoFPfQE79Tuns u8q2EKvJymVByn9P0+RtXHt0iZNM4W3OKIdchdwpeGSifauK1dob/rGhvGiEY8BEC+p77+ 05igEGvhhyby3f1WPkfDKbVHy4x4Xr0CDesAcVylvIRNzDMIv3s63w5wZMzQWrVK9fbpbZ RT5ahmP+8iFdOYbBxzEG841ATO5o1mVt1AflK9BTcML2n8tfAVj/PTbtN94idg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706452010; 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=bqjU4AKJKU8oV4HyMrSq2ODmA+IWo/9vQVmvGWWEqlo=; b=uWIM4hu8n5DTtBzn8MS3DEl5oXeUgtjWFxp/q0lDUn/JY2Y/S+XekGMrn/EXLgQ82z044T gBzyqBRSaSxnQWqe24zRQkeKnsI9bRyHNZRXxVVeQ8WBJ8dI5rb0XoReRG6mXmt7HvHCPr pkbK3JrEpz3JunFB3vDCVqTN+COIFjmF/YapNeyBxaWnzVo/KR580UcWvYbdnJvbWadK7c i+JYGu/uQLKifBk5MKVSqixKFDzRQZyhWZuNBNV4MvITB6cHDVJBOqSqs9Md4R4/t8Ok7g WVcAxCCXwx6OOeu2Bk5VbQoJVMrL6gH/N1ggZhim2oR+r6TEp2EpJTUh7zOUTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706452010; a=rsa-sha256; cv=none; b=MEvMHO/aC4hML7Rn7kUDc3G3uuaylaHmDsa18kLggZKTXy7LddM+cL+Vp2oVIzXzsjavyA 3AJfhMgS/NZViC566SO5Ec5RgFETnWwuOZULJu/llGhkpkdU9xmli6Q/S0R7INgl9BM0JM riGwqkQjehmsw59RQ/WUupG8fcm7xbtYgxL9/Y6EtX7NMqaPXe8HKfV074elTAwVqN1nHk CYH0iVZVm5ZPUJqOo4o0zL+ZHQZzXKuUoDV1hhm1H1nI7Ga9MBvB9IanLCG3HtdAI7Kn0S KBtZzIqmpG7hFZvnIWea5QUTUzLAZNg0/KU/S3V1dZkoOlsXuTCO/WWaK5WcOg== 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 4TNDJp47bqz1B8p; Sun, 28 Jan 2024 14:26:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40SEQoq2059038; Sun, 28 Jan 2024 14:26:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40SEQoX5059035; Sun, 28 Jan 2024 14:26:50 GMT (envelope-from git) Date: Sun, 28 Jan 2024 14:26:50 GMT Message-Id: <202401281426.40SEQoX5059035@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Gabriel M. Dutra" Subject: git: 7b753c1d2da9 - main - security/crowdsec: Update to 1.6.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dutra X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b753c1d2da908b3fdda848ccac8208548ab5536 Auto-Submitted: auto-generated The branch main has been updated by dutra: URL: https://cgit.FreeBSD.org/ports/commit/?id=7b753c1d2da908b3fdda848ccac8208548ab5536 commit 7b753c1d2da908b3fdda848ccac8208548ab5536 Author: marco AuthorDate: 2024-01-27 18:43:48 +0000 Commit: Gabriel M. Dutra CommitDate: 2024-01-28 14:26:05 +0000 security/crowdsec: Update to 1.6.0 ChangeLog: https://github.com/crowdsecurity/crowdsec/releases/tag/v1.6.0 Approved by: dbaio(mentor),garga(mentor) Differential Revision: https://reviews.freebsd.org/D43633 --- security/crowdsec/Makefile | 25 +++++++++++++++---------- security/crowdsec/distinfo | 10 +++++----- security/crowdsec/files/crowdsec.in | 2 +- security/crowdsec/files/pkg-install.in | 1 + security/crowdsec/files/upgrade-hub.in | 2 +- 5 files changed, 23 insertions(+), 17 deletions(-) diff --git a/security/crowdsec/Makefile b/security/crowdsec/Makefile index e32e54821012..3b0c6efe05c1 100644 --- a/security/crowdsec/Makefile +++ b/security/crowdsec/Makefile @@ -1,7 +1,6 @@ PORTNAME= crowdsec DISTVERSIONPREFIX= v -DISTVERSION= 1.5.5 -PORTREVISION= 1 +DISTVERSION= 1.6.0 CATEGORIES= security MAINTAINER= marco@crowdsec.net @@ -15,12 +14,18 @@ LIB_DEPENDS= libabsl_base.so:devel/abseil \ libre2.so:devel/re2 USES= go:1.21,modules pkgconfig -_COMMIT= d2d788c5 +_COMMIT= 4b8e6cd7 _BUILD_DATE= $$(date -u "+%F_%T") USE_RC_SUBR= crowdsec GO_MODULE= github.com/crowdsecurity/crowdsec -GO_TARGET= ./cmd/crowdsec ./cmd/crowdsec-cli ./cmd/notification-email ./cmd/notification-http ./cmd/notification-sentinel ./cmd/notification-slack ./cmd/notification-splunk +GO_TARGET= ./cmd/crowdsec \ + ./cmd/crowdsec-cli \ + ./cmd/notification-email \ + ./cmd/notification-http \ + ./cmd/notification-sentinel \ + ./cmd/notification-slack \ + ./cmd/notification-splunk GO_BUILDFLAGS= -v -trimpath -tags netgo,osusergo,sqlite_omit_load_extension,re2_cgo \ -ldflags="\ @@ -28,10 +33,10 @@ GO_BUILDFLAGS= -v -trimpath -tags netgo,osusergo,sqlite_omit_load_extension,re2_ -X github.com/crowdsecurity/go-cs-lib/version.Version=${DISTVERSIONPREFIX}${DISTVERSION}-freebsd \ -X github.com/crowdsecurity/go-cs-lib/version.BuildDate=${_BUILD_DATE} \ -X github.com/crowdsecurity/go-cs-lib/version.Tag=${_COMMIT} \ - -X $(GO_MODULE)/pkg/cwversion.Codename=alphaga \ - -X $(GO_MODULE)/pkg/csconfig.defaultConfigDir=${PREFIX}/etc/crowdsec \ - -X $(GO_MODULE)/pkg/csconfig.defaultDataDir=/var/db/crowdsec/data \ - -X $(GO_MODULE)/pkg/cwversion.Libre2=C++" + -X ${GO_MODULE}/pkg/cwversion.Codename=alphaga \ + -X ${GO_MODULE}/pkg/csconfig.defaultConfigDir=${PREFIX}/etc/crowdsec \ + -X ${GO_MODULE}/pkg/csconfig.defaultDataDir=/var/db/crowdsec/data \ + -X ${GO_MODULE}/pkg/cwversion.Libre2=C++" SUB_FILES= pkg-deinstall pkg-install pkg-message crowdsec.cron upgrade-hub @@ -151,10 +156,10 @@ do-install: @${RM} ${STAGEDIR}${ETCDIR}/config_win.yaml @${RM} ${STAGEDIR}${ETCDIR}/crowdsec.cron.daily @${RM} ${STAGEDIR}${ETCDIR}/crowdsec.service + @${RM} ${STAGEDIR}${ETCDIR}/context.yaml + @${RM} ${STAGEDIR}${ETCDIR}/detect.yaml @${RM} ${STAGEDIR}${ETCDIR}/dev.yaml @${RM} ${STAGEDIR}${ETCDIR}/user.yaml - @${RM} ${STAGEDIR}${ETCDIR}/detect.yaml - @${RM} ${STAGEDIR}${ETCDIR}/context.yaml @${RMDIR} ${STAGEDIR}${ETCDIR}/notifications/email @${RMDIR} ${STAGEDIR}${ETCDIR}/notifications/http @${RMDIR} ${STAGEDIR}${ETCDIR}/notifications/sentinel diff --git a/security/crowdsec/distinfo b/security/crowdsec/distinfo index 504d0e7fa0c5..0a0ed29eef9c 100644 --- a/security/crowdsec/distinfo +++ b/security/crowdsec/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1698136810 -SHA256 (go/security_crowdsec/crowdsec-v1.5.5/v1.5.5.mod) = a3047c2f98e4c26c4d8dff645893e3a19ff6e10ef00bc2dafcbe68a3e4415d19 -SIZE (go/security_crowdsec/crowdsec-v1.5.5/v1.5.5.mod) = 9647 -SHA256 (go/security_crowdsec/crowdsec-v1.5.5/v1.5.5.zip) = 0013a4e3201fe3d71a62b13df09fb32a05906ce29029a7257be8cb850bc41ed5 -SIZE (go/security_crowdsec/crowdsec-v1.5.5/v1.5.5.zip) = 1345499 +TIMESTAMP = 1706093904 +SHA256 (go/security_crowdsec/crowdsec-v1.6.0/v1.6.0.mod) = bf62cad10105ba50e3e0778651341cb7eca13ff5785c79a206ca8a5d42b90fed +SIZE (go/security_crowdsec/crowdsec-v1.6.0/v1.6.0.mod) = 10099 +SHA256 (go/security_crowdsec/crowdsec-v1.6.0/v1.6.0.zip) = c7cb4870cbcc848cf4c36161021930bc77f490f2701bcebdace6ad27a400a73f +SIZE (go/security_crowdsec/crowdsec-v1.6.0/v1.6.0.zip) = 1440975 diff --git a/security/crowdsec/files/crowdsec.in b/security/crowdsec/files/crowdsec.in index e84eeacf57e4..eb72069392a8 100644 --- a/security/crowdsec/files/crowdsec.in +++ b/security/crowdsec/files/crowdsec.in @@ -61,7 +61,7 @@ crowdsec_precmd() { # There are no machines, we create the main one if [ "$(cs_cli machines list -o json)" = "[]" ]; then echo "Registering LAPI" - cs_cli machines add "${crowdsec_machine_name}" --auto || : + cs_cli machines add "${crowdsec_machine_name}" --auto --force --error || : fi # Register to the central server to receive the community blocklist and more diff --git a/security/crowdsec/files/pkg-install.in b/security/crowdsec/files/pkg-install.in index 9c13af959b40..74bccb12c1ab 100644 --- a/security/crowdsec/files/pkg-install.in +++ b/security/crowdsec/files/pkg-install.in @@ -2,6 +2,7 @@ case $2 in "POST-INSTALL") + cscli hub update -o human --error > /dev/null if [ -e /var/run/crowdsec.running ]; then service crowdsec start rm -f /var/run/crowdsec.running diff --git a/security/crowdsec/files/upgrade-hub.in b/security/crowdsec/files/upgrade-hub.in index 27faaf3f598b..2364169f4425 100644 --- a/security/crowdsec/files/upgrade-hub.in +++ b/security/crowdsec/files/upgrade-hub.in @@ -11,7 +11,7 @@ upgraded=$(/usr/local/bin/cscli --error -o human hub upgrade) if [ -n "$upgraded" ]; then # splay initial metrics push sleep "$(jot -r 1 1 60)" - service crowdsec onestatus && service crowdsec reload + service crowdsec onestatus && service crowdsec onereload fi exit 0