iptables-compat: Keep xtables-config and xtables-events out from tree
Pablo Neira Ayuso
maintainerPATCH 1/1 iptables-compat: Keep xtables-config and xtables-events out from tree
These binaries are part of the compat layer, however they provide more features than actually available in the existing native iptables binaries. So let's keep them out from the tree before the 1.6.0 release as we only want to provide compatibility utils at this stage.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- iptables/Makefile.am | 3 +- iptables/xtables-compat-multi.c | 2 - iptables/xtables-config.c | 46 --------- iptables/xtables-events.c | 213 ---------------------------------------- 4 files changed, 1 insertion(+), 263 deletions(-) delete mode 100644 iptables/xtables-config.c delete mode 100644 iptables/xtables-events.c
iptables/Makefile.am +1 -2
@@ -38,7 +38,6 @@ xtables_compat_multi_SOURCES += xtables-config-parser.y xtables-config-syntax.l xtables_compat_multi_SOURCES += xtables-save.c xtables-restore.c \ xtables-standalone.c xtables.c nft.c \ nft-shared.c nft-ipv4.c nft-ipv6.c nft-arp.c \ - xtables-config.c xtables-events.c \ xtables-arp-standalone.c xtables-arp.c \ getethertype.c nft-bridge.c \ xtables-eb-standalone.c xtables-eb.c
@@ -69,7 +68,7 @@ endif if ENABLE_NFTABLES x_sbin_links = iptables-compat iptables-compat-restore iptables-compat-save \ ip6tables-compat ip6tables-compat-restore ip6tables-compat-save \ - arptables-compat ebtables-compat xtables-config xtables-events + arptables-compat ebtables-compat endif iptables-extensions.8: iptables-extensions.8.tmpl ../extensions/matches.man ../extensions/targets.man
iptables/xtables-compat-multi.c +0 -2
@@ -29,8 +29,6 @@ static const struct subcommand multi_subcommands[] = { {"arptables", xtables_arp_main}, {"arptables-compat", xtables_arp_main}, {"ebtables-compat", xtables_eb_main}, - {"xtables-config", xtables_config_main}, - {"xtables-events", xtables_events_main}, {NULL}, };
iptables/xtables-config.c deleted +0 -46
46 lines not on this page · raw message
iptables/xtables-events.c deleted +0 -213
213 lines not on this page · raw message
Signature · 1 line
2.1.4