nginx: update repository of maintained naxsi module#26029
Conversation
This comment was marked as spam.
This comment was marked as spam.
|
@JKSTAFF can you rebase this so I we can merge? changes are ok to me! |
9a022aa to
b50b7fc
Compare
8fec578 to
5c46a77
Compare
|
@Ansuel Done rebased to the latest master. If any other steps are required or there are any mistakes in my merge, please let me know. |
This comment was marked as low quality.
This comment was marked as low quality.
|
@JKSTAFF the pkg hash needs to be fixed. The suggested value is 2b8bf06f8e4cee95e287158c193c4930deab097bf1491c03a95dd8b0c2682d4c |
354cb90 to
571af55
Compare
|
@JKSTAFF you need to squash your commits. |
5e0568a to
0b697ba
Compare
|
@GeorgeSapkin Commits have been squashed. Thank you. |
537fd9f to
765b08e
Compare
Formality Check: FailedWe completed the verification flow. Please review the formatting overview logs below. 🛑 CRITICAL ERRORS
|
|
Is it necessary to define the conffiles path for this nginx module? |
openwrt-ai
left a comment
There was a problem hiding this comment.
Reviewed the single new commit (68f089c).
Commit checks
- Stray
fix pkg hashline in the commit message. After squashing, the message ends with a danglingfix pkg hashline below theSigned-off-by:trailer. This is leftover fixup noise and breaks the trailer block — please remove it (fold it into the body or drop it) so the message is just the subject, description, and the sign-off. - Invalid author / Signed-off-by name (
JK觸發器). The FormalityCheck "Git & Commits" run fails on this. OpenWrt requires a real name for the commit author and matchingSigned-off-by:; the CJK handle is rejected. Please setgit config user.nameto your real name and re-sign the commit. - Minor:
recomandedin the body is a typo forrecommended.
The two inline comments cover the remaining CI blockers (missing conffiles) and the missing PKG_RELEASE bump. I did not verify the naxsi_config/ → naxsi_rules/ path against the wargio/naxsi tree, but the directory rename matches the fork's restructuring and co-maintainer @Ansuel has confirmed the change is acceptable.
Generated by Claude Code
| SOURCE_VERSION:=d714f1636ea49a9a9f4f06dba14aee003e970834 | ||
| URL:=https://github.com/nbs-system/naxsi.git | ||
| MIRROR_HASH:=b0cef5fbf842f283eb5f0686ddd1afcd07d83abd7027c8cfb3e84a2223a34797 | ||
| SOURCE_DATE:=2025-01-05 |
There was a problem hiding this comment.
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
| $(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 |
There was a problem hiding this comment.
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
Switch the naxsi-module repository to an actively maintained fork recommended by nbs-system due to the original project is officially abandoned (archived in 2023.11.08). Signed-off-by: JKSTAFF <ionsuite@gmail.com>
|
Fixed invalid formats and added suggested values for conffiles |
openwrt-ai
left a comment
There was a problem hiding this comment.
Reviewed 1 new commit (9e841d1); the PR was squashed and rebased onto current master since my last review. Two items from that review are now resolved: the missing conffiles block has been added correctly (and FormalityCheck / OpenWrt Makefiles is green), and the commit message no longer has the stray fix pkg hash line or the recomanded typo.
Commit checks
- Author/committer name is still rejected by CI.
FormalityCheck / Git & Commitsfails withAuthor name format is invalid ('JKSTAFF')andCommitter name format is invalid ('JKSTAFF'). The previous CJK handle was replaced, but OpenWrt requires a real personal name (given + family name); the single all-caps tokenJKSTAFFis still rejected. Setgit config user.name "Your Real Name", thengit commit --amend --reset-author -s(or re-sign) so the author, committer, andSigned-off-by:line all carry your real name.
For continuity: the previously flagged PKG_RELEASE bump is still outstanding — PKG_RELEASE remains 1 while the naxsi module's built content changes. That thread is still current, so I'm not duplicating it inline.
Generated by Claude Code
nginx: update repository of maintained naxsi moduleMaintainer: @mhusaam @Ansuel
Compile tested:
mediatek/filogic / Bananapi BPI-R3 / openwrt/openwrt@1fad1b4 (v24.10.0)
Run tested:
mediatek/filogic / Bananapi BPI-R3 / openwrt/openwrt@1fad1b4 (v24.10.0)
Description:
This improvement switches the naxsi-module repository to an actively maintained fork recomanded by nbs-system due to the original project is officially abandoned (archived in 2023.11.08). The current version causes syntax error when reading the default
naxsi_core.rulesand other blocking and whitelist rules file as below: