From d8cf71e3660f968b86cf114c597c53d4e0fcd2f8 Mon Sep 17 00:00:00 2001 From: tetsumaki Date: Wed, 20 Nov 2024 21:31:49 +0000 Subject: [PATCH] testing/crowdsec: upgrade to 1.6.4, add new-plugin: notification-sentinel https://github.com/crowdsecurity/crowdsec/releases/tag/v1.6.4 --- testing/crowdsec/APKBUILD | 9 ++++++--- testing/crowdsec/system-sqlite.patch | 10 +++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/testing/crowdsec/APKBUILD b/testing/crowdsec/APKBUILD index 2b925ce8504..4e06a53cca2 100644 --- a/testing/crowdsec/APKBUILD +++ b/testing/crowdsec/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Nicolas Lorin # Maintainer: Nicolas Lorin pkgname=crowdsec -pkgver=1.6.3 +pkgver=1.6.4 pkgrel=0 pkgdesc="behavior detection engine, coupled with a global IP reputation network" url="https://crowdsec.net/" @@ -13,6 +13,7 @@ subpackages=" $pkgname-openrc $pkgname-email-plugin:_plugin $pkgname-http-plugin:_plugin + $pkgname-sentinel-plugin:_plugin $pkgname-slack-plugin:_plugin $pkgname-splunk-plugin:_plugin " @@ -57,6 +58,7 @@ package() { install -m 0600 \ cmd/notification-email/email.yaml \ cmd/notification-http/http.yaml \ + cmd/notification-sentinel/sentinel.yaml \ cmd/notification-slack/slack.yaml \ cmd/notification-splunk/splunk.yaml \ cmd/notification-sentinel/sentinel.yaml \ @@ -64,6 +66,7 @@ package() { install -m 0551 \ cmd/notification-email/notification-email \ cmd/notification-http/notification-http \ + cmd/notification-sentinel/notification-sentinel \ cmd/notification-slack/notification-slack \ cmd/notification-splunk/notification-splunk \ cmd/notification-sentinel/notification-sentinel \ @@ -88,7 +91,7 @@ _plugin() { } sha512sums=" -b5d19ef280c40c676c3e299cdd3ba11b5c841d7b6058e601ddedf4451c02df7935a9e7ad1238bc6bbc4e93beae088f18dcfe1132f94be1f4880d6452d95cf1ca crowdsec-1.6.3-2.tar.gz -7c70d397c6ebb4bbc2249ba65133db7f288742d61972204d5285065cc3f03d272efa4dde4f3e288d856ed641945f99161bffc5ae80ec9efce8b16fe05f2ef740 system-sqlite.patch +d2c599686a10bb9d7c222f8a47f88ad5a44cf6fd5aeea471434419a97cb1586fac2c89dcc7fb030e32bb444cb37d3412d83ce7bc3c14a56a2223ac6c39c949be crowdsec-1.6.4-2.tar.gz +58dbdd1207eaf92627e5047cc610fd921cabd5c84eca05389d48dd608271ee09229f7e935d72f129365abcd0a0411143c0c6110f9809b89d33d5038a1b2ffe8a system-sqlite.patch 098db47afd457c9d68c69097c31fae29cd0c0dc98199b254f75b130ac228ac43c024182bebd7eae756ae4fa2f54682b7f0534cb04311468224d9df2ce4f67ec2 crowdsec.initd " diff --git a/testing/crowdsec/system-sqlite.patch b/testing/crowdsec/system-sqlite.patch index ab4681809c4..d0b3e7cee7f 100644 --- a/testing/crowdsec/system-sqlite.patch +++ b/testing/crowdsec/system-sqlite.patch @@ -1,11 +1,11 @@ ---- a/Makefile 2023-09-18 11:54:09.000000000 +0200 -+++ b/Makefile 2023-09-18 20:19:59.347761343 +0200 -@@ -78,7 +78,7 @@ LD_OPTS_VARS += -X 'github.com/crowdsecu +--- a/Makefile 2024-11-20 11:12:20.000000000 +0000 ++++ b/Makefile 2024-11-20 21:29:51.335969720 +0000 +@@ -78,7 +78,7 @@ endif #expr_debug tag is required to enable the debug mode in expr -GO_TAGS := netgo,osusergo,sqlite_omit_load_extension,expr_debug +GO_TAGS := netgo,osusergo,sqlite_omit_load_extension,expr_debug,libsqlite3 - # this will be used by Go in the make target, some distributions require it - export PKG_CONFIG_PATH:=/usr/local/lib/pkgconfig:$(PKG_CONFIG_PATH) + # Allow building on ubuntu 24.10, see https://github.com/golang/go/issues/70023 + export CGO_LDFLAGS_ALLOW=-Wl,--(push|pop)-state.*