Skip to content

nginx: update repository of maintained naxsi module #26029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JKSTAFF wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −5
Open

nginx: update repository of maintained naxsi module #26029

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions net/nginx/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,10 +290,10 @@ define Download/nginx-mod-ts
endef

define Download/nginx-mod-naxsi
SOURCE_DATE:=2022-09-14
SOURCE_VERSION:=d714f1636ea49a9a9f4f06dba14aee003e970834
URL:=https://github.com/nbs-system/naxsi.git
MIRROR_HASH:=b0cef5fbf842f283eb5f0686ddd1afcd07d83abd7027c8cfb3e84a2223a34797
SOURCE_DATE:=2025-01-05

@openwrt-ai openwrt-ai Jul 9, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The naxsi module's source repo, revision and hash all change here, so the built nginx-mod-naxsi package content changes — but PKG_RELEASE is still 1. OpenWrt convention is to bump PKG_RELEASE whenever a package's built output changes, so users receive the rebuilt package on opkg upgrade. This is also the "Package net/nginx content changed without a PKG_RELEASE or version bump" warning from the FormalityCheck bot. Please bump PKG_RELEASE to 2.

Generated by Claude Code

SOURCE_VERSION:=b61ba37b3666b386c7a6d83fbcdf6ca3377395a1
URL:=https://github.com/wargio/naxsi.git
MIRROR_HASH:=2b8bf06f8e4cee95e287158c193c4930deab097bf1491c03a95dd8b0c2682d4c
PROTO:=git
endef

Expand Down Expand Up @@ -356,7 +356,11 @@ $(foreach m,$(PKG_MOD_EXTRA),$(eval $(call Module/Download,$(m))))

define Module/nginx-mod-naxsi/install
$(INSTALL_DIR) $(1)/etc/nginx
$(INSTALL_CONF) $(PKG_BUILD_DIR)/nginx-mod-naxsi/naxsi_config/naxsi_core.rules $(1)/etc/nginx
$(INSTALL_CONF) $(PKG_BUILD_DIR)/nginx-mod-naxsi/naxsi_rules/naxsi_core.rules $(1)/etc/nginx
endef

@openwrt-ai openwrt-ai Jul 9, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Regarding your standing question and the FormalityCheck "missing conffiles" critical error: because naxsi_core.rules is installed with $(INSTALL_CONF) into /etc/nginx, it is a user-editable config file, and without a conffiles block it would be silently overwritten on every sysupgrade/opkg upgrade. Adding a conffiles definition to the nginx-mod-naxsi package clears the CI error and preserves user edits, e.g.:

define Package/nginx-mod-naxsi/conffiles
/etc/nginx/naxsi_core.rules
endef

Note this pre-dates your change (the old line also used INSTALL_CONF), so it is not something you introduced — but since it currently blocks the merge, worth fixing here.

Generated by Claude Code


define Package/nginx-mod-naxsi/conffiles
/etc/nginx/naxsi_core.rules
endef

define Quilt/Refresh/Package
Expand Down