aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Lorin <androw95220@gmail.com>2023-09-18 20:44:01 +0200
committerKevin Daudt <kdaudt@alpinelinux.org>2023-09-18 19:42:01 +0000
commit38baf758ac61f707ba904b25823d4d4a651d6471 (patch)
treedb1a48b0145770e3264a13ee48d5bcd8bbdaf144
parentc35b5e9e7a41daf2f7b2d9bbfea52f24ffeaa0ac (diff)
testing/crowdsec: upgrade to 1.5.3
-rw-r--r--testing/crowdsec/APKBUILD28
-rw-r--r--testing/crowdsec/system-sqlite.patch20
2 files changed, 23 insertions, 25 deletions
diff --git a/testing/crowdsec/APKBUILD b/testing/crowdsec/APKBUILD
index 69193491875..e58ac0645e9 100644
--- a/testing/crowdsec/APKBUILD
+++ b/testing/crowdsec/APKBUILD
@@ -2,13 +2,13 @@
# Contributor: Nicolas Lorin <androw95220@gmail.com>
# Maintainer: Nicolas Lorin <androw95220@gmail.com>
pkgname=crowdsec
-pkgver=1.5.2
-pkgrel=2
+pkgver=1.5.3
+pkgrel=0
pkgdesc="behavior detection engine, coupled with a global IP reputation network"
url="https://crowdsec.net/"
arch="all"
license="MIT"
-makedepends="go sqlite-dev"
+makedepends="go sqlite-dev re2-dev"
subpackages="
$pkgname-openrc
$pkgname-email-plugin:_plugin
@@ -55,16 +55,18 @@ package() {
config/online_api_credentials.yaml \
"$pkgdir"/etc/crowdsec/
install -m 0600 \
- plugins/notifications/email/email.yaml \
- plugins/notifications/http/http.yaml \
- plugins/notifications/slack/slack.yaml \
- plugins/notifications/splunk/splunk.yaml \
+ cmd/notification-email/email.yaml \
+ cmd/notification-http/http.yaml \
+ cmd/notification-slack/slack.yaml \
+ cmd/notification-splunk/splunk.yaml \
+ cmd/notification-sentinel/sentinel.yaml \
"$pkgdir"/etc/crowdsec/notifications
install -m 0551 \
- plugins/notifications/email/notification-email \
- plugins/notifications/http/notification-http \
- plugins/notifications/slack/notification-slack \
- plugins/notifications/splunk/notification-splunk \
+ cmd/notification-email/notification-email \
+ cmd/notification-http/notification-http \
+ cmd/notification-slack/notification-slack \
+ cmd/notification-splunk/notification-splunk \
+ cmd/notification-sentinel/notification-sentinel \
"$pkgdir"/usr/libexec/crowdsec/plugins/
sed \
-e '/^\s*pid_dir:/d' \
@@ -86,7 +88,7 @@ _plugin() {
}
sha512sums="
-307bc3235b57977c30770d0e38aabc131eeafe8d949919e104bf47ee6d79a7c1667fd27f961d011b47c99b2119cf91e4c6c354a34e0219f89adf45d10e23b25b crowdsec-1.5.2.tar.gz
-07bd033523cf7c597d3a9734e5ced0f27009297cf2e3efb60547d2d674555729181b3512e88eeab46826d95641baccabab7e1a12241d6d0fd385fec6fed680c1 system-sqlite.patch
+d0fed8b507e0a975945f0a4b97c7d6d8c68c5cd3b89a1338c45d9b00a744d4d31e6b0d2ed65d1ddd123842b15ab310f1d4d51568cc400841e81eaea9aea06436 crowdsec-1.5.3.tar.gz
+ddabca84cb32b6461a3944b00e38807715320bbf46cf7b39fcbba0190d6dae7748950e1a424b95247779fdd15dbb2120fab43b80b479a03c895f246d45ecaf7b system-sqlite.patch
098db47afd457c9d68c69097c31fae29cd0c0dc98199b254f75b130ac228ac43c024182bebd7eae756ae4fa2f54682b7f0534cb04311468224d9df2ce4f67ec2 crowdsec.initd
"
diff --git a/testing/crowdsec/system-sqlite.patch b/testing/crowdsec/system-sqlite.patch
index 335e15a9248..63a5b7cd0f9 100644
--- a/testing/crowdsec/system-sqlite.patch
+++ b/testing/crowdsec/system-sqlite.patch
@@ -1,15 +1,11 @@
-diff --git a/Makefile b/Makefile
-index 334e738..149bee5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -38,8 +38,8 @@ ifdef BUILD_STATIC
- $(warning WARNING: The BUILD_STATIC variable is deprecated and has no effect. Builds are static by default since v1.5.0.)
+--- a/Makefile 2023-09-18 11:54:09.000000000 +0200
++++ b/Makefile 2023-09-18 20:19:59.347761343 +0200
+@@ -81,7 +81,7 @@ ifneq (,$(DOCKER_BUILD))
+ LD_OPTS_VARS += -X '$(GO_MODULE_NAME)/pkg/cwversion.System=docker'
endif
--export LD_OPTS=-ldflags "-s -w -extldflags '-static' $(LD_OPTS_VARS)" \
-- -trimpath -tags netgo,osusergo,sqlite_omit_load_extension
-+export LD_OPTS=-ldflags "$(LD_OPTS_VARS)" \
-+ -trimpath -tags netgo,osusergo,sqlite_omit_load_extension,libsqlite3
+-GO_TAGS := netgo,osusergo,sqlite_omit_load_extension
++GO_TAGS := netgo,osusergo,sqlite_omit_load_extension,libsqlite3
- ifneq (,$(TEST_COVERAGE))
- LD_OPTS += -cover
+ # 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)