From 3811b1f84324580c0f0e618d4b439319a4bbc23a Mon Sep 17 00:00:00 2001
From: mmetc <92726601+mmetc@users.noreply.github.com>
Date: Mon, 19 Sep 2022 20:21:27 +0200
Subject: [PATCH] security/crowdsec 1.0.1: fixed live logs (#3130)

---
 security/crowdsec/Makefile                             |  2 +-
 security/crowdsec/pkg-descr                            |  4 ++++
 .../crowdsec/src/etc/inc/plugins.inc.d/crowdsec.inc    | 10 ++++------
 .../OPNsense/CrowdSec/Api/ServiceController.php        |  2 +-
 .../mvc/app/models/OPNsense/CrowdSec/General.xml       |  2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/security/crowdsec/Makefile b/security/crowdsec/Makefile
index 20e019df1..b74fafce4 100644
--- a/security/crowdsec/Makefile
+++ b/security/crowdsec/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		crowdsec
-PLUGIN_VERSION=		1.0
+PLUGIN_VERSION=		1.0.1
 PLUGIN_DEPENDS=		crowdsec
 PLUGIN_COMMENT=		Lightweight and collaborative security engine
 PLUGIN_MAINTAINER=	marco@crowdsec.net
diff --git a/security/crowdsec/pkg-descr b/security/crowdsec/pkg-descr
index e7b571f60..53fc2bf43 100644
--- a/security/crowdsec/pkg-descr
+++ b/security/crowdsec/pkg-descr
@@ -8,6 +8,10 @@ WWW: https://crowdsec.net/
 Plugin Changelog
 ================
 
+1.0.1
+
+* fixed live logs
+
 1.0
 
 * first non-devel release
diff --git a/security/crowdsec/src/etc/inc/plugins.inc.d/crowdsec.inc b/security/crowdsec/src/etc/inc/plugins.inc.d/crowdsec.inc
index 79348aaf7..386bc73ca 100644
--- a/security/crowdsec/src/etc/inc/plugins.inc.d/crowdsec.inc
+++ b/security/crowdsec/src/etc/inc/plugins.inc.d/crowdsec.inc
@@ -53,13 +53,12 @@ function crowdsec_firewall(Plugin $fw)
             'ipprotocol' => 'inet',
             'descr'      => 'CrowdSec (IPv4)',
             'from'       => '$crowdsec_blacklists',     # $ to reference an alias
+            'direction'  => 'in',
             'type'       => 'block',
             'log'        => $rules_log_enabled,
             'tag'        => $rules_tag,
-            'label'      => 'blocked by crowdsec',
             'quick'      => true
-        ),
-        null
+        )
     );
 
     add_alias_if_not_exist('crowdsec6_blacklists', 'CrowdSec (IPv6)', 'IPv6');
@@ -70,13 +69,12 @@ function crowdsec_firewall(Plugin $fw)
             'ipprotocol' => 'inet6',
             'descr'      => 'CrowdSec (IPv6)',
             'from'       => '$crowdsec6_blacklists',    # $ to reference an alias
+            'direction'  => 'in',
             'type'       => 'block',
             'log'        => $rules_log_enabled,
             'tag'        => $rules_tag,
-            'label'      => 'blocked by crowdsec',
             'quick'      => true
-        ),
-        null
+        )
     );
 }
 
diff --git a/security/crowdsec/src/opnsense/mvc/app/controllers/OPNsense/CrowdSec/Api/ServiceController.php b/security/crowdsec/src/opnsense/mvc/app/controllers/OPNsense/CrowdSec/Api/ServiceController.php
index dae2711c7..477400418 100644
--- a/security/crowdsec/src/opnsense/mvc/app/controllers/OPNsense/CrowdSec/Api/ServiceController.php
+++ b/security/crowdsec/src/opnsense/mvc/app/controllers/OPNsense/CrowdSec/Api/ServiceController.php
@@ -43,7 +43,7 @@ class ServiceController extends ApiControllerBase
         $backend = new Backend();
         $response = $backend->configdRun("crowdsec crowdsec-status");
 
-        $status = "unkown";
+        $status = "unknown";
         if (strpos($response, "not running") > 0) {
             $status = "stopped";
         } elseif (strpos($response, "is running") > 0) {
diff --git a/security/crowdsec/src/opnsense/mvc/app/models/OPNsense/CrowdSec/General.xml b/security/crowdsec/src/opnsense/mvc/app/models/OPNsense/CrowdSec/General.xml
index d71245d0d..dd124e045 100644
--- a/security/crowdsec/src/opnsense/mvc/app/models/OPNsense/CrowdSec/General.xml
+++ b/security/crowdsec/src/opnsense/mvc/app/models/OPNsense/CrowdSec/General.xml
@@ -1,7 +1,7 @@
 <model>
   <mount>//OPNsense/crowdsec/general</mount>
   <description>CrowdSec general configuration</description>
-  <version>1.0</version>
+  <version>1.0.1</version>
   <items>
 
     <agent_enabled type="BooleanField">