[PATCH] build: put xtables.conf in EXTRA_DIST

[PATCH] build: put xtables.conf in EXTRA_DIST

[Jan Engelhardt]

To make distcheck succeed, disting it is enough; it does not need
to be installed.

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
 
 .PHONY: tarball
-- 
2.39.0

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

[Phil Sutter]

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")

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

[Jan Engelhardt]

On Friday 2023-01-13 12:47, Phil Sutter wrote:

>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?

Sure.

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

[Pablo Neira Ayuso]

On Fri, Jan 13, 2023 at 12:47:30PM +0100, Phil Sutter wrote:
> 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.

Go ahead with removing /etc/xtables.conf.

> > 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].)

IIRC ebtables is using a custom ethertype file, because definitions
are different there.

But is this installed file used in any way these days?

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

[Arturo Borrero Gonzalez]

On 1/16/23 12:57, Pablo Neira Ayuso wrote:
>> 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].)
> IIRC ebtables is using a custom ethertype file, because definitions
> are different there.
> 
> But is this installed file used in any way these days?

+1 to deleting it.

At least in Debian it is installed in other package and of no use here.

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

[Jan Engelhardt]

On Monday 2023-01-16 12:57, Pablo Neira Ayuso wrote:
>On Fri, Jan 13, 2023 at 12:47:30PM +0100, Phil Sutter wrote:
>
>IIRC ebtables is using a custom ethertype file, because definitions
>are different there.
>
>But is this installed file used in any way these days?

Probably not; the version I have has this to say:

# This list could be found on:
#         http://www.iana.org/assignments/ethernet-numbers
#         http://www.iana.org/assignments/ieee-802-numbers

With such official-ness, ebtables's ethertypes has a rather low priority.

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

[Phil Sutter]

On Mon, Jan 16, 2023 at 06:18:34PM +0100, Jan Engelhardt wrote:
> 
> On Monday 2023-01-16 12:57, Pablo Neira Ayuso wrote:
> >On Fri, Jan 13, 2023 at 12:47:30PM +0100, Phil Sutter wrote:
> >
> >IIRC ebtables is using a custom ethertype file, because definitions
> >are different there.
> >
> >But is this installed file used in any way these days?
> 
> Probably not; the version I have has this to say:
> 
> # This list could be found on:
> #         http://www.iana.org/assignments/ethernet-numbers
> #         http://www.iana.org/assignments/ieee-802-numbers
> 
> With such official-ness, ebtables's ethertypes has a rather low priority.

This header statement exists even in legacy ebtables repo' version. I
fear the opposite is the case and everyone's rather copying from ebtables
or iptables just to provide /etc/ethertypes without depending on the
tools.

My local Gentoo install at least has /etc/ethertypes exactly as in
ebtables repo and the package source states "File extracted from the
iptables tarball".

Maybe we're the original source?

Cheers, Phil

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

[Pablo Neira Ayuso]

On Tue, Jan 17, 2023 at 04:50:27PM +0100, Phil Sutter wrote:
> On Mon, Jan 16, 2023 at 06:18:34PM +0100, Jan Engelhardt wrote:
> > 
> > On Monday 2023-01-16 12:57, Pablo Neira Ayuso wrote:
> > >On Fri, Jan 13, 2023 at 12:47:30PM +0100, Phil Sutter wrote:
> > >
> > >IIRC ebtables is using a custom ethertype file, because definitions
> > >are different there.
> > >
> > >But is this installed file used in any way these days?
> > 
> > Probably not; the version I have has this to say:
> > 
> > # This list could be found on:
> > #         http://www.iana.org/assignments/ethernet-numbers
> > #         http://www.iana.org/assignments/ieee-802-numbers
> > 
> > With such official-ness, ebtables's ethertypes has a rather low priority.
> 
> This header statement exists even in legacy ebtables repo' version. I
> fear the opposite is the case and everyone's rather copying from ebtables
> or iptables just to provide /etc/ethertypes without depending on the
> tools.
> 
> My local Gentoo install at least has /etc/ethertypes exactly as in
> ebtables repo and the package source states "File extracted from the
> iptables tarball".
> 
> Maybe we're the original source?

In ebtables, there _PATH_ETHERTYPES which is indirectly used by
getethertypebyname() by a few extensions.

In iptables, this code exists too, using a different definition:

include/xtables.h:#define XT_PATH_ETHERTYPES     "/etc/ethertypes"

extensions/libebt_arp.c:                        ent = xtables_getethertypebyname(argv[optind - 1]);
extensions/libebt_vlan.c:                       ethent = xtables_getethertypebyname(optarg);

It seems this file is required by a few extensions and the translation
infrastructure.

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

[Phil Sutter]

On Tue, Jan 17, 2023 at 04:56:35PM +0100, Pablo Neira Ayuso wrote:
> On Tue, Jan 17, 2023 at 04:50:27PM +0100, Phil Sutter wrote:
> > On Mon, Jan 16, 2023 at 06:18:34PM +0100, Jan Engelhardt wrote:
> > > 
> > > On Monday 2023-01-16 12:57, Pablo Neira Ayuso wrote:
> > > >On Fri, Jan 13, 2023 at 12:47:30PM +0100, Phil Sutter wrote:
> > > >
> > > >IIRC ebtables is using a custom ethertype file, because definitions
> > > >are different there.
> > > >
> > > >But is this installed file used in any way these days?
> > > 
> > > Probably not; the version I have has this to say:
> > > 
> > > # This list could be found on:
> > > #         http://www.iana.org/assignments/ethernet-numbers
> > > #         http://www.iana.org/assignments/ieee-802-numbers
> > > 
> > > With such official-ness, ebtables's ethertypes has a rather low priority.
> > 
> > This header statement exists even in legacy ebtables repo' version. I
> > fear the opposite is the case and everyone's rather copying from ebtables
> > or iptables just to provide /etc/ethertypes without depending on the
> > tools.
> > 
> > My local Gentoo install at least has /etc/ethertypes exactly as in
> > ebtables repo and the package source states "File extracted from the
> > iptables tarball".
> > 
> > Maybe we're the original source?
> 
> In ebtables, there _PATH_ETHERTYPES which is indirectly used by
> getethertypebyname() by a few extensions.
> 
> In iptables, this code exists too, using a different definition:
> 
> include/xtables.h:#define XT_PATH_ETHERTYPES     "/etc/ethertypes"
> 
> extensions/libebt_arp.c:                        ent = xtables_getethertypebyname(argv[optind - 1]);
> extensions/libebt_vlan.c:                       ethent = xtables_getethertypebyname(optarg);
> 
> It seems this file is required by a few extensions and the translation
> infrastructure.

Thanks for investigating. I guess dropping a file we depend on to exist
*and* introduced in the first place is shooting one's own foot with
extra steps. Also packagers are used to ignore the file (if not needed)
already. :)

Cheers, Phil

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

[Pablo Neira Ayuso]

On Tue, Jan 17, 2023 at 05:03:18PM +0100, Phil Sutter wrote:
> On Tue, Jan 17, 2023 at 04:56:35PM +0100, Pablo Neira Ayuso wrote:
> > On Tue, Jan 17, 2023 at 04:50:27PM +0100, Phil Sutter wrote:
> > > On Mon, Jan 16, 2023 at 06:18:34PM +0100, Jan Engelhardt wrote:
> > > > 
> > > > On Monday 2023-01-16 12:57, Pablo Neira Ayuso wrote:
> > > > >On Fri, Jan 13, 2023 at 12:47:30PM +0100, Phil Sutter wrote:
> > > > >
> > > > >IIRC ebtables is using a custom ethertype file, because definitions
> > > > >are different there.
> > > > >
> > > > >But is this installed file used in any way these days?
> > > > 
> > > > Probably not; the version I have has this to say:
> > > > 
> > > > # This list could be found on:
> > > > #         http://www.iana.org/assignments/ethernet-numbers
> > > > #         http://www.iana.org/assignments/ieee-802-numbers
> > > > 
> > > > With such official-ness, ebtables's ethertypes has a rather low priority.
> > > 
> > > This header statement exists even in legacy ebtables repo' version. I
> > > fear the opposite is the case and everyone's rather copying from ebtables
> > > or iptables just to provide /etc/ethertypes without depending on the
> > > tools.
> > > 
> > > My local Gentoo install at least has /etc/ethertypes exactly as in
> > > ebtables repo and the package source states "File extracted from the
> > > iptables tarball".
> > > 
> > > Maybe we're the original source?
> > 
> > In ebtables, there _PATH_ETHERTYPES which is indirectly used by
> > getethertypebyname() by a few extensions.
> > 
> > In iptables, this code exists too, using a different definition:
> > 
> > include/xtables.h:#define XT_PATH_ETHERTYPES     "/etc/ethertypes"
> > 
> > extensions/libebt_arp.c:                        ent = xtables_getethertypebyname(argv[optind - 1]);
> > extensions/libebt_vlan.c:                       ethent = xtables_getethertypebyname(optarg);
> > 
> > It seems this file is required by a few extensions and the translation
> > infrastructure.
> 
> Thanks for investigating. I guess dropping a file we depend on to exist
> *and* introduced in the first place is shooting one's own foot with
> extra steps. Also packagers are used to ignore the file (if not needed)
> already. :)

TBH, I thought this was too a left-over, it is good to revisit stuff.

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

[Duncan Roe]

On Tue, Jan 17, 2023 at 04:50:27PM +0100, Phil Sutter wrote:
> On Mon, Jan 16, 2023 at 06:18:34PM +0100, Jan Engelhardt wrote:
> >
> > On Monday 2023-01-16 12:57, Pablo Neira Ayuso wrote:
> > >On Fri, Jan 13, 2023 at 12:47:30PM +0100, Phil Sutter wrote:
> > >
> > >IIRC ebtables is using a custom ethertype file, because definitions
> > >are different there.
> > >
> > >But is this installed file used in any way these days?
> >
> > Probably not; the version I have has this to say:
> >
> > # This list could be found on:
> > #         http://www.iana.org/assignments/ethernet-numbers
> > #         http://www.iana.org/assignments/ieee-802-numbers
> >
> > With such official-ness, ebtables's ethertypes has a rather low priority.
>
> This header statement exists even in legacy ebtables repo' version. I
> fear the opposite is the case and everyone's rather copying from ebtables
> or iptables just to provide /etc/ethertypes without depending on the
> tools.
>
> My local Gentoo install at least has /etc/ethertypes exactly as in
> ebtables repo and the package source states "File extracted from the
> iptables tarball".
>
> Maybe we're the original source?
>
> Cheers, Phil

Slackware distributes /etc/ethertypes from iptables *and* ebtables

Cheers ... Duncan.