From 6235bf41a78de73fa3edf61fac59ff1da7d3a7dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20R=C3=A9veill=C3=A9?=
 <benjamin.reveille@gmail.com>
Date: Mon, 6 Apr 2026 17:57:35 +0200
Subject: [PATCH 1/2] crowdsec-firewall-bouncer: fix config file conflict
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Renames config file from `crowdsec` to `crowdsec-firewall-bouncer`
Fixes issue openwrt/packages#28615
Bumps PKG_RELEASE

This is based on leow140's original PR (openwrt/packages#28991) that went stale and was closed.

Signed-off-by: Benjamin Réveillé <benjamin.reveille@gmail.com>
---
 net/crowdsec-firewall-bouncer/Makefile                      | 6 +++---
 .../{crowdsec.config => crowdsec-firewall-bouncer.config}   | 0
 .../files/crowdsec-firewall-bouncer.initd                   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename net/crowdsec-firewall-bouncer/files/{crowdsec.config => crowdsec-firewall-bouncer.config} (100%)

diff --git a/net/crowdsec-firewall-bouncer/Makefile b/net/crowdsec-firewall-bouncer/Makefile
index 8c8189f9a5a9f2..805d8beb39b493 100644
--- a/net/crowdsec-firewall-bouncer/Makefile
+++ b/net/crowdsec-firewall-bouncer/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=crowdsec-firewall-bouncer
 PKG_VERSION:=0.0.34
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/crowdsecurity/cs-firewall-bouncer/tar.gz/v$(PKG_VERSION)?
@@ -81,14 +81,14 @@ define Package/crowdsec-firewall-bouncer/install
 	$(call GoPackage/Package/Install/Bin,$(1))
 
 	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/crowdsec.config $(1)/etc/config/crowdsec
+	$(INSTALL_CONF) ./files/crowdsec-firewall-bouncer.config $(1)/etc/config/crowdsec-firewall-bouncer
 
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/crowdsec-firewall-bouncer.initd $(1)/etc/init.d/crowdsec-firewall-bouncer
 endef
 
 define Package/crowdsec-firewall-bouncer/conffiles
-/etc/config/crowdsec
+/etc/config/crowdsec-firewall-bouncer
 endef
 
 $(eval $(call GoBinPackage,crowdsec-firewall-bouncer))
diff --git a/net/crowdsec-firewall-bouncer/files/crowdsec.config b/net/crowdsec-firewall-bouncer/files/crowdsec-firewall-bouncer.config
similarity index 100%
rename from net/crowdsec-firewall-bouncer/files/crowdsec.config
rename to net/crowdsec-firewall-bouncer/files/crowdsec-firewall-bouncer.config
diff --git a/net/crowdsec-firewall-bouncer/files/crowdsec-firewall-bouncer.initd b/net/crowdsec-firewall-bouncer/files/crowdsec-firewall-bouncer.initd
index 33ebbb0eaef259..11d4afe373b7c8 100755
--- a/net/crowdsec-firewall-bouncer/files/crowdsec-firewall-bouncer.initd
+++ b/net/crowdsec-firewall-bouncer/files/crowdsec-firewall-bouncer.initd
@@ -9,14 +9,14 @@ PROG=/usr/bin/cs-firewall-bouncer
 VARCONFIGDIR=/var/etc/crowdsec/bouncers
 VARCONFIG=/var/etc/crowdsec/bouncers/crowdsec-firewall-bouncer.yaml
 
-CONFIGURATION=crowdsec
+CONFIGURATION=crowdsec-firewall-bouncer
 
 TABLE="crowdsec"
 TABLE6="crowdsec6"
 
 service_triggers() {
 	procd_add_reload_trigger crowdsec-firewall-bouncer
-	procd_add_config_trigger "config.change" "crowdsec" /etc/init.d/crowdsec-firewall-bouncer reload
+	procd_add_config_trigger "config.change" "crowdsec-firewall-bouncer" /etc/init.d/crowdsec-firewall-bouncer reload
 }
 
 init_yaml() {

From d84d0d3ddfc2583d7ada93a6f80fbd802ccfdbaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20R=C3=A9veill=C3=A9?=
 <benjamin.reveille@gmail.com>
Date: Sun, 7 Jun 2026 21:36:45 +0200
Subject: [PATCH 2/2] crowdsec-firewall-bouncer: add test-version.sh
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

cs-firewall-bouncer does not recognize -? for version test

Signed-off-by: Benjamin Réveillé <benjamin.reveille@gmail.com>
---
 net/crowdsec-firewall-bouncer/test-version.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 net/crowdsec-firewall-bouncer/test-version.sh

diff --git a/net/crowdsec-firewall-bouncer/test-version.sh b/net/crowdsec-firewall-bouncer/test-version.sh
new file mode 100644
index 00000000000000..6651794577fb77
--- /dev/null
+++ b/net/crowdsec-firewall-bouncer/test-version.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# shellcheck shell=busybox
+
+case "$PKG_NAME" in
+crowdsec-firewall-bouncer)
+	exit 0
+	;;
+
+*)
+	echo "Untested package: $PKG_NAME" >&2
+	exit 1
+	;;
+esac
+