From b6b0cf292a831ca161b7facc3bb342a519751665 Mon Sep 17 00:00:00 2001
From: mmetc <92726601+mmetc@users.noreply.github.com>
Date: Tue, 4 Feb 2025 17:44:51 +0100
Subject: [PATCH] Update crowdsec rule reference ($ -> <>); bump release
 (#4526)

---
 security/crowdsec/Makefile                                    | 3 +--
 security/crowdsec/pkg-descr                                   | 4 ++++
 security/crowdsec/src/etc/inc/plugins.inc.d/crowdsec.inc      | 4 ++--
 .../src/opnsense/mvc/app/models/OPNsense/CrowdSec/General.xml | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/security/crowdsec/Makefile b/security/crowdsec/Makefile
index dad0bf60c..7218bfb38 100644
--- a/security/crowdsec/Makefile
+++ b/security/crowdsec/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		crowdsec
-PLUGIN_VERSION=		1.0.8
-PLUGIN_REVISION=	1
+PLUGIN_VERSION=		1.0.9
 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 cb1429cf4..f7889b32d 100644
--- a/security/crowdsec/pkg-descr
+++ b/security/crowdsec/pkg-descr
@@ -8,6 +8,10 @@ WWW: https://crowdsec.net/
 Plugin Changelog
 ================
 
+1.0.9
+
+ * Update rule reference ($ -> <>) for opnsense 25.1
+
 1.0.8
 
 * Enable use_wal, remove warning
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 386bc73ca..a1c149a1c 100644
--- a/security/crowdsec/src/etc/inc/plugins.inc.d/crowdsec.inc
+++ b/security/crowdsec/src/etc/inc/plugins.inc.d/crowdsec.inc
@@ -52,7 +52,7 @@ function crowdsec_firewall(Plugin $fw)
         array(
             'ipprotocol' => 'inet',
             'descr'      => 'CrowdSec (IPv4)',
-            'from'       => '$crowdsec_blacklists',     # $ to reference an alias
+            'from'       => '<crowdsec_blacklists>',
             'direction'  => 'in',
             'type'       => 'block',
             'log'        => $rules_log_enabled,
@@ -68,7 +68,7 @@ function crowdsec_firewall(Plugin $fw)
         array(
             'ipprotocol' => 'inet6',
             'descr'      => 'CrowdSec (IPv6)',
-            'from'       => '$crowdsec6_blacklists',    # $ to reference an alias
+            'from'       => '<crowdsec6_blacklists>',
             'direction'  => 'in',
             'type'       => 'block',
             'log'        => $rules_log_enabled,
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 f332b3b64..4208065f4 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.8</version>
+  <version>1.0.9</version>
   <items>
 
     <agent_enabled type="BooleanField">