Skip to content
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.

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

iptables: 1.8.7 -> 1.8.8 #173114

Merged
merged 3 commits into from
Jun 19, 2022
Merged

iptables: 1.8.7 -> 1.8.8 #173114

merged 3 commits into from
Jun 19, 2022

Conversation

Izorkin
Copy link
Contributor

@Izorkin Izorkin commented May 15, 2022

Description of changes

Update packages:

  • libnetfilter_cthelper to 1.0.1
  • libnetfilter_cttimeout to 1.0.1
  • iptables to 1.8.8

Changelog:

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@Izorkin
Copy link
Contributor Author

Izorkin commented May 18, 2022

cc @SuperSandro2000

@Izorkin
Copy link
Contributor Author

Izorkin commented May 22, 2022

Added patch - https://git.netfilter.org/iptables/commit/?id=f319389525b066b7dc6d389c88f16a0df3b8f189

Gcc complains about missing types. Some commits introduced u_int* instead
of uint*. Use uint treewide.

Fixes errors in the form of:
In file included from xtables-legacy-multi.c:5:
xshared.h:83:56: error: unknown type name 'u_int16_t'; did you mean 'uint16_t'?
    83 | set_option(unsigned int *options, unsigned int option, u_int16_t *invflg,
        |                                                        ^~~~~~~~~
        |                                                        uint16_t
make[6]: *** [Makefile:712: xtables_legacy_multi-xtables-legacy-multi.o] Error 1

Avoid libipq API breakage by adjusting libipq.h include accordingly. For
arpt_mangle.h kernel uAPI header, apply same change as in kernel commit
e91ded8db5747 ("uapi: netfilter_arp: use __u8 instead of u_int8_t").

@Izorkin
Copy link
Contributor Author

Izorkin commented Jun 6, 2022

@Izorkin
Copy link
Contributor Author

Izorkin commented Jun 9, 2022

cc @ajs124

Copy link
Member

@ajs124 ajs124 left a comment

Choose a reason for hiding this comment

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

diff LGTM, but haven't tested this

@vcunat vcunat merged commit c04f364 into NixOS:staging Jun 19, 2022
@Izorkin Izorkin deleted the update-iptables branch June 19, 2022 11:27
@alyssais
Copy link
Member

alyssais commented Jun 29, 2022

This broke the iptables build on Musl. Fix is #179570.

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.

None yet

7 participants