Re: [PATCH] build: put xtables.conf in EXTRA_DIST

[Phil Sutter <phil@nwl.cc>]

Hi Jan,

On Thu, Jan 12, 2023 at 11:55:17PM +0100, Jan Engelhardt wrote:
> To make distcheck succeed, disting it is enough; it does not need
> to be installed.

Instead of preventing it from being installed, how about dropping it
altogether?

The last code using it was dropped by me three years ago, apparently
after decision at NFWS[1]. Pablo removed the standalone 'xtables-config'
utility back in 2015[2], yet I see a remaining xtables_config_main
prototype in xtables-multi.h which seems to have been missed back then.

> 
> Fixes: v1.8.8-150-g3822a992
> Signed-off-by: Jan Engelhardt <jengelh@inai.de>
> ---
>  Makefile.am | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index 451c3cb2..10198753 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -16,11 +16,11 @@ SUBDIRS         += extensions
>  # Depends on extensions/libext.a:
>  SUBDIRS         += iptables
>  
> -EXTRA_DIST	= autogen.sh iptables-test.py xlate-test.py
> +EXTRA_DIST	= autogen.sh iptables-test.py xlate-test.py etc/xtables.conf
>  
>  if ENABLE_NFTABLES
>  confdir		= $(sysconfdir)
> -dist_conf_DATA	= etc/ethertypes etc/xtables.conf
> +dist_conf_DATA	= etc/ethertypes
>  endif

While being at it, I wonder about ethertypes: At least on the distros I
run locally, the file is provided by other packages than iptables. Do we
still need it? (It was added by Arturo for parity with legacy ebtables
in [3].)

Thanks, Phil

[1] 06fd5e46d46f7 ("xtables: Drop support for /etc/xtables.conf")
[2] 7462e4aa757dc ("iptables-compat: Keep xtables-config and xtables-events out from tree")
[3] 3397fb3be98ff ("ebtables-compat: include /etc/ethertypes in tarball")