Attachment 230225 Details for Bug 260525 – patch for crowdsec 1.2.1_2

[patch] patch for crowdsec 1.2.1_2

0001-security-crowdsec-update-to-1.2.1-2.patch (text/plain), 2.16 KB, created by marco on 2021-12-18 22:07:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: marco

Created: 2021-12-18 22:07:35 UTC

Size: 2.16 KB

patch

obsolete

>From a28c4bf0bbdd9e926f198c0898651a87198b60d9 Mon Sep 17 00:00:00 2001
>From: <marco+freebsd@crowdsec.net>
>Date: Sat, 18 Dec 2021 22:55:37 +0100
>Subject: [PATCH] security/crowdsec: update to 1.2.1-2
>
>---
> security/crowdsec/Makefile                       |  1 +
> security/crowdsec/files/crowdsec.in              |  9 ++-------
> security/crowdsec/files/patch-config_acquis.yaml | 12 ++++++++++++
> 3 files changed, 15 insertions(+), 7 deletions(-)
> create mode 100644 security/crowdsec/files/patch-config_acquis.yaml
>
>diff --git a/security/crowdsec/Makefile b/security/crowdsec/Makefile
>index f3683aee9c30..eecf3dd17dad 100644
>--- a/security/crowdsec/Makefile
>+++ b/security/crowdsec/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	crowdsec
> PORTVERSION=	1.2.1	# NOTE: change BUILD_VERSION and BUILD_TAG as well
>+PORTREVISION=   2
> DISTVERSIONPREFIX=	v
> CATEGORIES=	security
> 
>diff --git a/security/crowdsec/files/crowdsec.in b/security/crowdsec/files/crowdsec.in
>index 04b7c02130f9..710769fd6daa 100644
>--- a/security/crowdsec/files/crowdsec.in
>+++ b/security/crowdsec/files/crowdsec.in
>@@ -59,13 +59,8 @@ crowdsec_precmd() {
>         cs_cli capi register || :
>     fi
> 
>-    cs_cli collections inspect crowdsecurity/linux >/dev/null || cs_cli collections install crowdsecurity/linux || :
>-
>-    DATA_DIR=$(Config ConfigPaths.DataDir)
>-    if [ ! -f "${DATA_DIR}/GeoLite2-City.mmdb" ]; then
>-        echo "Installing GeoIP enricher"
>-        cs_cli parsers install crowdsecurity/geoip-enrich || :
>-    fi
>+    cs_cli collections inspect crowdsecurity/freebsd | grep ^installed | grep -q true || \
>+        cs_cli collections install crowdsecurity/freebsd || :
> }
> 
> crowdsec_start()
>diff --git a/security/crowdsec/files/patch-config_acquis.yaml b/security/crowdsec/files/patch-config_acquis.yaml
>new file mode 100644
>index 000000000000..67b4ef3c693b
>--- /dev/null
>+++ b/security/crowdsec/files/patch-config_acquis.yaml
>@@ -0,0 +1,12 @@
>+--- config/acquis.yaml.orig	2021-12-15 10:39:37 UTC
>++++ config/acquis.yaml
>+@@ -11,6 +11,8 @@ filenames:
>+ labels:
>+   type: syslog
>+ ---
>+-filename: /var/log/apache2/*.log
>++filenames:
>++ - /var/log/httpd-access.log
>++ - /var/log/httpd-error.log
>+ labels:
>+   type: apache2
>-- 
>2.32.0
>

Actions: View | Diff

Attachments on bug 260525: 230225