* [PATCH] build: put xtables.conf in EXTRA_DIST
@ 2023-01-12 22:55 Jan Engelhardt
2023-01-13 11:47 ` Phil Sutter
0 siblings, 1 reply; 11+ messages in thread
From: Jan Engelhardt @ 2023-01-12 22:55 UTC (permalink / raw)
To: phil; +Cc: netfilter-devel
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
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH] build: put xtables.conf in EXTRA_DIST
2023-01-12 22:55 [PATCH] build: put xtables.conf in EXTRA_DIST Jan Engelhardt
@ 2023-01-13 11:47 ` Phil Sutter
2023-01-13 21:24 ` Jan Engelhardt
2023-01-16 11:57 ` Pablo Neira Ayuso
0 siblings, 2 replies; 11+ messages in thread
From: Phil Sutter @ 2023-01-13 11:47 UTC (permalink / raw)
To: Jan Engelhardt
Cc: netfilter-devel, Pablo Neira Ayuso, Arturo Borrero Gonzalez
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")
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] build: put xtables.conf in EXTRA_DIST
2023-01-13 11:47 ` Phil Sutter
@ 2023-01-13 21:24 ` Jan Engelhardt
2023-01-16 11:57 ` Pablo Neira Ayuso
1 sibling, 0 replies; 11+ messages in thread
From: Jan Engelhardt @ 2023-01-13 21:24 UTC (permalink / raw)
To: Phil Sutter; +Cc: netfilter-devel, Pablo Neira Ayuso, Arturo Borrero Gonzalez
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.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] build: put xtables.conf in EXTRA_DIST
2023-01-13 11:47 ` Phil Sutter
2023-01-13 21:24 ` Jan Engelhardt
@ 2023-01-16 11:57 ` Pablo Neira Ayuso
2023-01-16 16:31 ` Arturo Borrero Gonzalez
2023-01-16 17:18 ` Jan Engelhardt
1 sibling, 2 replies; 11+ messages in thread
From: Pablo Neira Ayuso @ 2023-01-16 11:57 UTC (permalink / raw)
To: Phil Sutter, Jan Engelhardt, netfilter-devel, Arturo Borrero Gonzalez
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?
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] build: put xtables.conf in EXTRA_DIST
2023-01-16 11:57 ` Pablo Neira Ayuso
@ 2023-01-16 16:31 ` Arturo Borrero Gonzalez
2023-01-16 17:18 ` Jan Engelhardt
1 sibling, 0 replies; 11+ messages in thread
From: Arturo Borrero Gonzalez @ 2023-01-16 16:31 UTC (permalink / raw)
To: Pablo Neira Ayuso, Phil Sutter, Jan Engelhardt; +Cc: netfilter-devel
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.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] build: put xtables.conf in EXTRA_DIST
2023-01-16 11:57 ` Pablo Neira Ayuso
2023-01-16 16:31 ` Arturo Borrero Gonzalez
@ 2023-01-16 17:18 ` Jan Engelhardt
2023-01-17 15:50 ` Phil Sutter
1 sibling, 1 reply; 11+ messages in thread
From: Jan Engelhardt @ 2023-01-16 17:18 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Phil Sutter, netfilter-devel, Arturo Borrero Gonzalez
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.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] build: put xtables.conf in EXTRA_DIST
2023-01-16 17:18 ` Jan Engelhardt
@ 2023-01-17 15:50 ` Phil Sutter
2023-01-17 15:56 ` Pablo Neira Ayuso
2023-01-18 7:27 ` Duncan Roe
0 siblings, 2 replies; 11+ messages in thread
From: Phil Sutter @ 2023-01-17 15:50 UTC (permalink / raw)
To: Jan Engelhardt
Cc: Pablo Neira Ayuso, netfilter-devel, Arturo Borrero Gonzalez
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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] build: put xtables.conf in EXTRA_DIST
2023-01-17 15:50 ` Phil Sutter
@ 2023-01-17 15:56 ` Pablo Neira Ayuso
2023-01-17 16:03 ` Phil Sutter
2023-01-18 7:27 ` Duncan Roe
1 sibling, 1 reply; 11+ messages in thread
From: Pablo Neira Ayuso @ 2023-01-17 15:56 UTC (permalink / raw)
To: Phil Sutter, Jan Engelhardt, netfilter-devel, Arturo Borrero Gonzalez
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.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] build: put xtables.conf in EXTRA_DIST
2023-01-17 15:56 ` Pablo Neira Ayuso
@ 2023-01-17 16:03 ` Phil Sutter
2023-01-17 16:04 ` Pablo Neira Ayuso
0 siblings, 1 reply; 11+ messages in thread
From: Phil Sutter @ 2023-01-17 16:03 UTC (permalink / raw)
To: Pablo Neira Ayuso
Cc: Jan Engelhardt, netfilter-devel, Arturo Borrero Gonzalez
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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] build: put xtables.conf in EXTRA_DIST
2023-01-17 16:03 ` Phil Sutter
@ 2023-01-17 16:04 ` Pablo Neira Ayuso
0 siblings, 0 replies; 11+ messages in thread
From: Pablo Neira Ayuso @ 2023-01-17 16:04 UTC (permalink / raw)
To: Phil Sutter, Jan Engelhardt, netfilter-devel, Arturo Borrero Gonzalez
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.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] build: put xtables.conf in EXTRA_DIST
2023-01-17 15:50 ` Phil Sutter
2023-01-17 15:56 ` Pablo Neira Ayuso
@ 2023-01-18 7:27 ` Duncan Roe
1 sibling, 0 replies; 11+ messages in thread
From: Duncan Roe @ 2023-01-18 7:27 UTC (permalink / raw)
To: Netfilter Development; +Cc: Phil Sutter, Jan Engelhardt
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.
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-01-18 7:54 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-12 22:55 [PATCH] build: put xtables.conf in EXTRA_DIST Jan Engelhardt
2023-01-13 11:47 ` Phil Sutter
2023-01-13 21:24 ` Jan Engelhardt
2023-01-16 11:57 ` Pablo Neira Ayuso
2023-01-16 16:31 ` Arturo Borrero Gonzalez
2023-01-16 17:18 ` Jan Engelhardt
2023-01-17 15:50 ` Phil Sutter
2023-01-17 15:56 ` Pablo Neira Ayuso
2023-01-17 16:03 ` Phil Sutter
2023-01-17 16:04 ` Pablo Neira Ayuso
2023-01-18 7:27 ` Duncan Roe
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.