Bump iptables to v1.8.9

https://www.netfilter.org/projects/iptables/files/changes-iptables-1.8.9.txt Removed some unneeded packages and patches as well. See: 41dd834 ("Bump iptables to v1.8.8") See: d295632 ("iptables-nft support") See: ab5d6c2 ("Add some notes in docs about iptables versions and modes") See: https://bugzilla.netfilter.org/show_bug.cgi?id=1632 See: d399d64 ("Fix iptables mode detection and fallback") Signed-off-by: Tom Wieczorek <[email protected]>
k0sproject · Sep 12, 2023 · 713eb18 · 713eb18
1 parent d3d77d8
commit 713eb18
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 233 deletions.
diff --git a/embedded-bins/Makefile.variables b/embedded-bins/Makefile.variables
@@ -59,7 +59,7 @@ konnectivity_build_go_flags = "-a"
 konnectivity_build_go_ldflags = "-w -s"
 konnectivity_build_go_ldflags_extra = "-extldflags=-static"
 
-iptables_version = 1.8.7
+iptables_version = 1.8.9
 iptables_buildimage = docker.io/library/alpine:$(alpine_patch_version)
 
 clean-iid-files = \

diff --git a/embedded-bins/iptables/Dockerfile b/embedded-bins/iptables/Dockerfile
@@ -1,12 +1,14 @@
 ARG BUILDIMAGE
 FROM $BUILDIMAGE AS build
 
-RUN apk add build-base git file curl \
-	linux-headers pkgconf bison flex libmnl-dev libmnl-static libnftnl-dev
+RUN apk add build-base curl pkgconf \
+	linux-headers \
+	libmnl-dev libmnl-static \
+	libnftnl-dev
 
 ARG VERSION
-RUN curl -L https://www.netfilter.org/projects/iptables/files/iptables-$VERSION.tar.bz2 \
-	| tar -C / -jx
+RUN curl -L https://www.netfilter.org/projects/iptables/files/iptables-$VERSION.tar.xz \
+	| tar -C / -Jx
 
 ARG TARGET_OS
 RUN cd /iptables-$VERSION && \

diff --git a/embedded-bins/iptables/revert-fix-eth-alen.patch b/embedded-bins/iptables/revert-fix-eth-alen.patch
diff --git a/embedded-bins/iptables/use-uint-instead-of-u_int.patch b/embedded-bins/iptables/use-uint-instead-of-u_int.patch