diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2019-03-08 15:51:00 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-03-11 08:15:16 +0100 |
| commit | 383336c4866792096fe72cea8a348d6e6d6c401c (patch) | |
| tree | ff977fdfa17d8c24452a1757c99a2d930c333ed3 /rules/iptables.make | |
| parent | 258333ab16f5c4d683112e100f52477868c11494 (diff) | |
| download | ptxdist-383336c4866792096fe72cea8a348d6e6d6c401c.tar.gz ptxdist-383336c4866792096fe72cea8a348d6e6d6c401c.tar.xz | |
iptables: version bump 1.6.1 -> 1.8.2
- version bump
- pick patches from upstream to fix build with older kernel headers
- fix IPv4-only build
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/iptables.make')
| -rw-r--r-- | rules/iptables.make | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/rules/iptables.make b/rules/iptables.make index 7d6620635..6dc859268 100644 --- a/rules/iptables.make +++ b/rules/iptables.make @@ -21,8 +21,8 @@ PACKAGES-$(PTXCONF_IPTABLES) += iptables # # Paths and names # -IPTABLES_VERSION := 1.6.1 -IPTABLES_MD5 := ab38a33806b6182c6f53d6afb4619add +IPTABLES_VERSION := 1.8.2 +IPTABLES_MD5 := 944558e88ddcc3b9b0d9550070fa3599 IPTABLES := iptables-$(IPTABLES_VERSION) IPTABLES_SUFFIX := tar.bz2 IPTABLES_URL := http://ftp.netfilter.org/pub/iptables/$(IPTABLES).$(IPTABLES_SUFFIX) @@ -109,23 +109,23 @@ ifdef PTXCONF_IPTABLES_IPV4 endif ifdef PTXCONF_IPTABLES_INSTALL_TOOLS - @$(call install_copy, iptables, 0, 0, 0755, -, /usr/sbin/xtables-multi) - @$(call install_link, iptables, ../sbin/xtables-multi, /usr/bin/iptables-xml) + @$(call install_copy, iptables, 0, 0, 0755, -, /usr/sbin/xtables-legacy-multi) + @$(call install_link, iptables, ../sbin/xtables-legacy-multi, /usr/bin/iptables-xml) ifdef PTXCONF_IPTABLES_LIBNFNETLINK @$(call install_copy, iptables, 0, 0, 0755, -, /usr/sbin/nfnl_osf) endif ifdef PTXCONF_IPTABLES_IPV6 # # IPv6 part - @$(call install_link, iptables, xtables-multi, /usr/sbin/ip6tables) - @$(call install_link, iptables, xtables-multi, /usr/sbin/ip6tables-restore) - @$(call install_link, iptables, xtables-multi, /usr/sbin/ip6tables-save) + @$(call install_link, iptables, xtables-legacy-multi, /usr/sbin/ip6tables) + @$(call install_link, iptables, xtables-legacy-multi, /usr/sbin/ip6tables-restore) + @$(call install_link, iptables, xtables-legacy-multi, /usr/sbin/ip6tables-save) endif ifdef PTXCONF_IPTABLES_IPV4 # # IPv4 part - @$(call install_link, iptables, xtables-multi, /usr/sbin/iptables) - @$(call install_link, iptables, xtables-multi, /usr/sbin/iptables-restore) - @$(call install_link, iptables, xtables-multi, /usr/sbin/iptables-save) + @$(call install_link, iptables, xtables-legacy-multi, /usr/sbin/iptables) + @$(call install_link, iptables, xtables-legacy-multi, /usr/sbin/iptables-restore) + @$(call install_link, iptables, xtables-legacy-multi, /usr/sbin/iptables-save) endif ifdef PTXCONF_IPTABLES_IPV6_SYSTEMD_UNIT @@ -156,24 +156,24 @@ endif # # compability layer for nftables ifdef PTXCONF_IPTABLES_NFTABLES_COMPAT - @$(call install_copy, iptables, 0, 0, 0755, -, /usr/sbin/xtables-compat-multi) + @$(call install_copy, iptables, 0, 0, 0755, -, /usr/sbin/xtables-nft-multi) ifdef PTXCONF_IPTABLES_IPV4 # # IPv4 part - @$(call install_link, iptables, xtables-compat-multi, /usr/sbin/iptables-compat) - @$(call install_link, iptables, xtables-compat-multi, /usr/sbin/iptables-compat-save) - @$(call install_link, iptables, xtables-compat-multi, /usr/sbin/iptables-compat-restore) + @$(call install_link, iptables, xtables-nft-multi, /usr/sbin/iptables-nft) + @$(call install_link, iptables, xtables-nft-multi, /usr/sbin/iptables-nft-save) + @$(call install_link, iptables, xtables-nft-multi, /usr/sbin/iptables-nft-restore) endif ifdef PTXCONF_IPTABLES_IPV6 # # IPv6 part - @$(call install_link, iptables, xtables-compat-multi, /usr/sbin/ip6tables-compat) - @$(call install_link, iptables, xtables-compat-multi, /usr/sbin/ip6tables-compat-save) - @$(call install_link, iptables, xtables-compat-multi, /usr/sbin/ip6tables-compat-restore) + @$(call install_link, iptables, xtables-nft-multi, /usr/sbin/ip6tables-nft) + @$(call install_link, iptables, xtables-nft-multi, /usr/sbin/ip6tables-nft-save) + @$(call install_link, iptables, xtables-nft-multi, /usr/sbin/ip6tables-nft-restore) endif - @$(call install_link, iptables, xtables-compat-multi, /usr/sbin/arptables-compat) - @$(call install_link, iptables, xtables-compat-multi, /usr/sbin/ebtables-compat) + @$(call install_link, iptables, xtables-nft-multi, /usr/sbin/arptables-nft) + @$(call install_link, iptables, xtables-nft-multi, /usr/sbin/ebtables-nft) endif @$(call install_finish, iptables) |