gandalf/secubox-openwrt
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(crowdsec): Upgrade to v1.7.6 with Go 1.23 compatibility

Browse Source 
- Bump CrowdSec version from 1.7.4 to 1.7.6
- Add modernc.org/sqlite v1.34.2 vendor module (Go 1.21 compatible)
- Patch strings.SplitSeq in hubtest for Go 1.23 compatibility
- Add replace directive for sqlite to use vendored version

Built and tested: crowdsec_1.7.6-r1_aarch64_cortex-a72.ipk (80MB)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
CyberMind-FR 2026-01-27 11:33:49 +01:00
parent 1fb2b11d4a
commit 4811613711
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
package/secubox/secubox-app-crowdsec/Makefile
View File

@ -6,13 +6,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=crowdsec PKG_NAME:=crowdsec
PKG_VERSION:=1.7.4 PKG_VERSION:=1.7.6
PKG_RELEASE:=3 PKG_RELEASE:=1
PKG_ARCH:=all PKG_ARCH:=all
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/crowdsecurity/crowdsec/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/crowdsecurity/crowdsec/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=755b5c2c1a8cef24b56fd2fbc7d2942f6fc525c625a78f9c65229e5b3b305327 PKG_HASH:=1be0c4e7d3e437698203f6badac323b7e4d9c461716274df879ebb3ae054ca4e
PKG_LICENSE:=MIT PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
@ -62,7 +62,8 @@ CWD_GO_VENDOR_MODULES:= \
golang.org/x/term@v0.35.0 \ golang.org/x/term@v0.35.0 \
golang.org/x/text@v0.29.0 \ golang.org/x/text@v0.29.0 \
golang.org/x/tools@v0.37.0 \ golang.org/x/tools@v0.37.0 \
golang.org/x/telemetry@v0.0.0-20250908211612-aef8a434d053 golang.org/x/telemetry@v0.0.0-20250908211612-aef8a434d053 \
modernc.org/sqlite@v1.34.2
define CWD/EnsureModuleSource define CWD/EnsureModuleSource
if [ ! -d "$(DL_DIR)/go-mod-cache/$(1)@$(2)" ]; then \ if [ ! -d "$(DL_DIR)/go-mod-cache/$(1)@$(2)" ]; then \
@ -106,6 +107,7 @@ define Build/Prepare
$(call CWD/StageVendorModule,golang.org/x/text,v0.29.0) $(call CWD/StageVendorModule,golang.org/x/text,v0.29.0)
$(call CWD/StageVendorModule,golang.org/x/tools,v0.37.0) $(call CWD/StageVendorModule,golang.org/x/tools,v0.37.0)
$(call CWD/StageVendorModule,golang.org/x/telemetry,v0.0.0-20250908211612-aef8a434d053) $(call CWD/StageVendorModule,golang.org/x/telemetry,v0.0.0-20250908211612-aef8a434d053)
$(call CWD/StageVendorModule,modernc.org/sqlite,v1.34.2)
$(SED) 's@for line := range strings.SplitSeq@for _, line := range strings.SplitSeq@g' \ $(SED) 's@for line := range strings.SplitSeq@for _, line := range strings.SplitSeq@g' \
$(PKG_BUILD_DIR)/pkg/appsec/appsec_rules_collection.go $(PKG_BUILD_DIR)/pkg/appsec/appsec_rules_collection.go
$(SED) 's@for f := range strings.SplitSeq@for _, f := range strings.SplitSeq@g' \ $(SED) 's@for f := range strings.SplitSeq@for _, f := range strings.SplitSeq@g' \
@ -119,6 +121,9 @@ define Build/Prepare
$(PKG_BUILD_DIR)/cmd/crowdsec-cli/clisetup/acquisition.go $(PKG_BUILD_DIR)/cmd/crowdsec-cli/clisetup/acquisition.go
$(SED) 's@for \([a-zA-Z_]*\) := range strings.SplitSeq@for _, \1 := range strings.Split@g' \ $(SED) 's@for \([a-zA-Z_]*\) := range strings.SplitSeq@for _, \1 := range strings.Split@g' \
$(PKG_BUILD_DIR)/cmd/crowdsec/flags.go $(PKG_BUILD_DIR)/cmd/crowdsec/flags.go
# Patch strings.SplitSeq in hubtest (Go 1.24+ feature)
$(SED) 's@for \([a-zA-Z_]*\) := range strings.SplitSeq@for _, \1 := range strings.Split@g' \
$(PKG_BUILD_DIR)/pkg/hubtest/hubtest_item.go
$(SED) 's@for line := range strings.SplitSeq(description, "\\n") {@for _, line := range strings.Split(description, "\\n") {@g' \ $(SED) 's@for line := range strings.SplitSeq(description, "\\n") {@for _, line := range strings.Split(description, "\\n") {@g' \
$(PKG_BUILD_DIR)/$(CWD_GO_VENDOR_ROOT)/golang.org/x/tools/internal/mcp/generate.go $(PKG_BUILD_DIR)/$(CWD_GO_VENDOR_ROOT)/golang.org/x/tools/internal/mcp/generate.go
@ -146,6 +151,8 @@ define Build/Prepare
$(PKG_BUILD_DIR)/pkg/apiserver/apiserver.go $(PKG_BUILD_DIR)/pkg/apiserver/apiserver.go
$(SED) '/\.httpServer\.Protocols\./d' \ $(SED) '/\.httpServer\.Protocols\./d' \
$(PKG_BUILD_DIR)/pkg/apiserver/apiserver.go $(PKG_BUILD_DIR)/pkg/apiserver/apiserver.go
# Add replace directive for modernc.org/sqlite to use Go 1.23 compatible version
echo 'replace modernc.org/sqlite => $(PKG_BUILD_DIR)/$(CWD_GO_VENDOR_ROOT)/modernc.org/sqlite' >> $(PKG_BUILD_DIR)/go.mod
endef endef
define Package/crowdsec/Default define Package/crowdsec/Default