Skip to content

xtables-addons: update to 3.30#28167

Merged
pprindeville merged 1 commit intoopenwrt:masterfrom
graysky2:6.18-xt-addons
Apr 26, 2026
Merged

xtables-addons: update to 3.30#28167
pprindeville merged 1 commit intoopenwrt:masterfrom
graysky2:6.18-xt-addons

Conversation

@graysky2
Copy link
Copy Markdown
Contributor

@graysky2 graysky2 commented Dec 25, 2025

📦 Package Details

Maintainer: @jow-
(You can find this by checking the history of the package Makefile.)

Description:

This upstream release allows clean builds against linux 6.18. Fix LUA PacketScript build on 6.18 by switching to ccflags-y and restoring the required -isystem include path. Remove compat_xtables since the module no longer exists in 3.30 and drop all dependent kmod references.

Fix CI build failure with backport: 600-xt_pknock-fox-do_div-signness-mismatch.patch

Note that upstream tarball changed from xz to zst.


🧪 Run Testing Details

  • OpenWrt Version: SNAPSHOT
  • OpenWrt Target/Subtarget:
  • OpenWrt Device:

✅ Formalities

  • I have reviewed the CONTRIBUTING.md file for detailed contributing guidelines.

If your PR contains a patch:

  • It can be applied using git am
  • It has been refreshed to avoid offsets, fuzzes, etc., using
    make package/<your-package>/refresh V=s
  • It is structured in a way that it is potentially upstreamable
    (e.g., subject line, commit description, etc.)
    We must try to upstream patches to reduce maintenance burden.

@LGA1150
Copy link
Copy Markdown
Contributor

LGA1150 commented Dec 25, 2025

v3.30 fixed that

https://codeberg.org/jengelh/xtables-addons/commit/438a7e519ac4f71d8423e323bc2d1aabfb059692

@graysky2 graysky2 changed the title xtables-addons: disable for linux 6.18 xtables-addons: update to 3.30 Dec 25, 2025
@graysky2
Copy link
Copy Markdown
Contributor Author

thanks @LGA1150

Comment thread net/xtables-addons/patches/300-fix-path-Makefile.extra.patch Outdated
Comment thread net/xtables-addons/Makefile
@graysky2 graysky2 force-pushed the 6.18-xt-addons branch 2 times, most recently from 4465c1c to 7778328 Compare December 26, 2025 13:05
@LGA1150
Copy link
Copy Markdown
Contributor

LGA1150 commented Dec 27, 2025

Package failed to build on 32-bit because of signness mismatch. do_div expects a u64 dividend, but time64_t is s64.
@jengelh

@jengelh
Copy link
Copy Markdown

jengelh commented Dec 29, 2025

https://codeberg.org/jengelh/xtables-addons/commit/3c5c336fc0e47fea9baa912fc8d314ae9d1fa521

@graysky2 graysky2 force-pushed the 6.18-xt-addons branch 3 times, most recently from 2453dd5 to 7224134 Compare January 3, 2026 17:32
Copy link
Copy Markdown
Member

@pprindeville pprindeville left a comment

Choose a reason for hiding this comment

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

Minor changes

Comment thread net/xtables-addons/patches/200-add-lua-packetscript.patch Outdated
Comment thread net/xtables-addons/patches/200-add-lua-packetscript.patch Outdated
Copy link
Copy Markdown
Member

@pprindeville pprindeville left a comment

Choose a reason for hiding this comment

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

other than the gratuitous whitespace changes, it looks okay.

@pprindeville
Copy link
Copy Markdown
Member

@graysky2 If you can fix the whitespace changes, I'll approve and merge.

This upstream release allows clean builds against linux 6.18. Fix LUA
PacketScript build on 6.18 by switching to ccflags-y and restoring the
required -isystem include path. Remove compat_xtables since the module
no longer exists in 3.30 and drop all dependent kmod references.

Fix CI build failure with backport:
600-xt_pknock-fox-do_div-signness-mismatch.patch

Note that upstream tarball changed from xz to zst.

Signed-off-by: John Audia <therealgraysky@proton.me>
Copy link
Copy Markdown
Member

@pprindeville pprindeville left a comment

Choose a reason for hiding this comment

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

Reformatted. LGTM

@pprindeville pprindeville merged commit e1adf8f into openwrt:master Apr 26, 2026
12 checks passed
@graysky2 graysky2 deleted the 6.18-xt-addons branch April 26, 2026 08:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants