From 759798bae367909c67cebcd6163ada85337f18f7 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Wed, 26 Jun 2019 13:59:13 +0200 Subject: [PATCH 01/26] ebtables-2.0.10-36 - Fix segfault with non-existing lock directory --- ...ault-with-missing-lockfile-directory.patch | 40 +++++++++++++++++++ ebtables.spec | 6 ++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 0040-Fix-segfault-with-missing-lockfile-directory.patch diff --git a/0040-Fix-segfault-with-missing-lockfile-directory.patch b/0040-Fix-segfault-with-missing-lockfile-directory.patch new file mode 100644 index 0000000..084b879 --- /dev/null +++ b/0040-Fix-segfault-with-missing-lockfile-directory.patch @@ -0,0 +1,40 @@ +From 97a7193e1838da9ab9631d07f6b3cedf63a5995d Mon Sep 17 00:00:00 2001 +From: Phil Sutter +Date: Tue, 9 Apr 2019 14:21:25 +0200 +Subject: [PATCH] Fix segfault with missing lockfile directory + +Apparently, dirname() modifies the buffer passed to it. Given a +read-only location, this leads to a segfault. Use a buffer initialized +(and tailored) to the content of LOCKFILE macro at compile-time instead. + +Fixes: f45756c1ca3b5 ("Allow customizing lockfile location at configure time") +Signed-off-by: Phil Sutter +Signed-off-by: Florian Westphal +(cherry picked from commit c9348e18f3cdd52a7cb1586e03a55cefac08d849) +Signed-off-by: Phil Sutter +--- + libebtc.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libebtc.c b/libebtc.c +index f2a2b500ea751..2a9ab87ac99c0 100644 +--- a/libebtc.c ++++ b/libebtc.c +@@ -140,12 +140,13 @@ int use_lockfd; + * or -2 on any other error. */ + static int lock_file() + { ++ char pathbuf[] = LOCKFILE; + int fd, try = 0; + + retry: + fd = open(LOCKFILE, O_CREAT, 00600); + if (fd < 0) { +- if (try == 1 || mkdir(dirname(LOCKFILE), 00700)) ++ if (try == 1 || mkdir(dirname(pathbuf), 00700)) + return -2; + try = 1; + goto retry; +-- +2.21.0 + diff --git a/ebtables.spec b/ebtables.spec index 967eac5..eb96156 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -3,7 +3,7 @@ Name: ebtables Version: 2.0.10 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPLv2+ URL: http://ebtables.sourceforge.net/ @@ -53,6 +53,7 @@ Patch36: 0036-Adjust-.gitignore-to-renamed-files.patch Patch37: 0037-extensions-Drop-Makefile.patch Patch38: 0038-Allow-customizing-lockfile-location-at-configure-tim.patch Patch39: 0039-extensions-Add-AUDIT-target.patch +Patch40: 0040-Fix-segfault-with-missing-lockfile-directory.patch BuildRequires: autogen BuildRequires: autoconf @@ -216,6 +217,9 @@ manpfx=%{_mandir}/man8/ebtables %files compat %changelog +* Wed Jun 26 2019 Phil Sutter - 2.0.10-36 +- Fix segfault with non-existing lock directory + * Wed Apr 24 2019 Phil Sutter - 2.0.10-35 - Workaround missing broute table support in ebtables-nft From 1e1fee5e12b036ecd11d343168cb7e5059369d42 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 22:56:42 +0000 Subject: [PATCH 02/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ebtables.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ebtables.spec b/ebtables.spec index eb96156..efb252c 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -3,7 +3,7 @@ Name: ebtables Version: 2.0.10 -Release: 36%{?dist} +Release: 37%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPLv2+ URL: http://ebtables.sourceforge.net/ @@ -217,6 +217,9 @@ manpfx=%{_mandir}/man8/ebtables %files compat %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 2.0.10-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Wed Jun 26 2019 Phil Sutter - 2.0.10-36 - Fix segfault with non-existing lock directory From dd63d10d4bc25fd5c52e9e530f2065e92f16dc86 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Tue, 22 Oct 2019 15:35:07 +0200 Subject: [PATCH 03/26] ebtables-2.0.10-38 - Drop compat sub-package again --- ebtables.spec | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/ebtables.spec b/ebtables.spec index efb252c..55431e9 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -3,7 +3,7 @@ Name: ebtables Version: 2.0.10 -Release: 37%{?dist} +Release: 38%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPLv2+ URL: http://ebtables.sourceforge.net/ @@ -106,17 +106,6 @@ ebtables systemd services This package provides the systemd ebtables service that has been split out of the base package for better integration with alternatives. -%package compat -Summary: Transitioning helper package for services sub-package split -Obsoletes: ebtables < 2.0.10-32 -Requires: ebtables-legacy = %{version}-%{release} -Requires: ebtables-services = %{version}-%{release} - -%description compat -This package only exists to help transition ebtables users to the -new package split. It will be removed after one distribution release -cycle, please do not reference it or depend on it in any way. - %prep %autosetup -p1 -n ebtables-v%{version}-%{ebminor} # Convert to UTF-8 @@ -175,7 +164,7 @@ if [ $1 -eq 0 ]; then ebtables %{_sbindir}/ebtables-legacy fi -# When upgrading ebtables to ebtables-{legacy,services,compat}, +# When upgrading ebtables to ebtables-{legacy,services}, # postun in ebtables thinks it is uninstalled and removes alternatives. # Counter this with a trigger here to have it installed again. %triggerpostun legacy -- ebtables @@ -214,9 +203,10 @@ manpfx=%{_mandir}/man8/ebtables %config(noreplace) %{_sysconfdir}/sysconfig/ebtables-config %ghost %{_sysconfdir}/sysconfig/ebtables -%files compat - %changelog +* Tue Oct 22 2019 Phil Sutter - 2.0.10-38 +- Drop compat sub-package again + * Wed Jul 24 2019 Fedora Release Engineering - 2.0.10-37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 12a4d36dafbe32053f6b690ca67372f9c3911eeb Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Wed, 30 Oct 2019 12:48:17 +0100 Subject: [PATCH 04/26] ebtables-2.0.10-39 - Make services sub-package obsolete compat to fix upgrade path --- ebtables.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ebtables.spec b/ebtables.spec index 55431e9..72c449c 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -3,7 +3,7 @@ Name: ebtables Version: 2.0.10 -Release: 38%{?dist} +Release: 39%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPLv2+ URL: http://ebtables.sourceforge.net/ @@ -99,6 +99,7 @@ nftables internally. It is provided by iptables-ebtables package. %package services Summary: ebtables systemd services %{?systemd_ordering} +Obsoletes: ebtables-compat < 2.0.10-39 %description services ebtables systemd services @@ -204,6 +205,9 @@ manpfx=%{_mandir}/man8/ebtables %ghost %{_sysconfdir}/sysconfig/ebtables %changelog +* Wed Oct 30 2019 Phil Sutter - 2.0.10-39 +- Make services sub-package obsolete compat to fix upgrade path + * Tue Oct 22 2019 Phil Sutter - 2.0.10-38 - Drop compat sub-package again From ab5067511cd280784f48612347c661d1c1ce8336 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 2 Dec 2019 11:58:14 -0500 Subject: [PATCH 05/26] update to 2.0.11 (all of Phils awesome patches merged) --- .gitignore | 1 + ebtables.spec | 53 +++++++-------------------------------------------- sources | 2 +- 3 files changed, 9 insertions(+), 47 deletions(-) diff --git a/.gitignore b/.gitignore index 19cdd5b..3a4afb2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ ebtables-v2.0.9-2.tar.gz /ebtables-v2.0.10-1.tar.gz /ebtables-v2.0.10-2.tar.gz /ebtables-v2.0.10-4.tar.gz +/ebtables-2.0.11.tar.bz2 diff --git a/ebtables.spec b/ebtables.spec index 72c449c..128b2d8 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -1,60 +1,18 @@ -%global ebminor 4 %undefine _ld_as_needed Name: ebtables -Version: 2.0.10 -Release: 39%{?dist} +Version: 2.0.11 +Release: 1%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPLv2+ URL: http://ebtables.sourceforge.net/ -Source0: http://downloads.sourceforge.net/ebtables/ebtables-v%{version}-%{ebminor}.tar.gz +Source0: ftp://ftp.netfilter.org/pub/ebtables/ebtables-%{version}.tar.bz2 Source1: ebtables-legacy-save Source2: ebtables-helper Source3: ebtables.service Source4: ebtables-config -Patch1: 0001-add-RARP-and-update-iana-url.patch -Patch2: 0002-fix-compilation-warning.patch -Patch3: 0003-add-info-about-Wl-no-as-needed.patch -Patch4: 0004-workaround-for-kernel-regression-bug-IPv6-source-des.patch -Patch5: 0005-Add-noflush-command-line-support-for-ebtables-restor.patch -Patch6: 0006-don-t-print-IPv6-mask-if-it-s-all-ones-based-on-patc.patch -Patch7: 0007-Add-kernel-headers-needed-from-v3.16.patch -Patch8: 0008-extensions-Use-stdint-types.patch -Patch9: 0009-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch -Patch10: 0010-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch -Patch11: 0011-ebtables-extensions-Constify-option-struct.patch -Patch12: 0012-Use-flock-for-concurrent-option.patch -Patch13: 0013-Fix-locking-if-LOCKDIR-does-not-exist.patch -Patch14: 0014-include-sync-linux-netfilter_bridge-ebt_ip.h-with-ke.patch -Patch15: 0015-Move-ICMP-type-handling-functions-from-ebt_ip6-to-us.patch -Patch16: 0016-ebt_ip-add-support-for-matching-ICMP-type-and-code.patch -Patch17: 0017-ebt_ip-add-support-for-matching-IGMP-type.patch -Patch18: 0018-extensions-Add-string-filter-to-ebtables.patch -Patch19: 0019-include-Fix-musl-libc-compatibility.patch -Patch20: 0020-ebtables-Fix-build-errors-and-warnings.patch -Patch21: 0021-build-update-ebtables.h-from-kernel-and-drop-local-u.patch -Patch22: 0022-extensions-fix-build-failure-on-fc28.patch -Patch23: 0023-extensions-ebt_string-take-action-if-snprintf-discar.patch -Patch24: 0024-build-drop-install-o-g-root.patch -Patch25: 0025-build-rename-sed-source-files-to-.in.patch -Patch26: 0026-build-use-autoconf-style-placeholders-in-sed-ed-file.patch -Patch27: 0027-extensions-use-__attribute__-constructor-for-autoreg.patch -Patch28: 0028-Add-.gitignore.patch -Patch29: 0029-build-move-to-automake.patch -Patch30: 0030-ebtablesd-avoid-build-warning.patch -Patch31: 0031-extensions-among-Fix-bitmask-check.patch -Patch32: 0032-ebtables-legacy-renaming.patch -Patch33: 0033-ebtables-drop-.spec-file.patch -Patch34: 0034-ebtables-drop-sysvinit-script.patch -Patch35: 0035-Print-IPv6-prefixes-in-CIDR-notation.patch -Patch36: 0036-Adjust-.gitignore-to-renamed-files.patch -Patch37: 0037-extensions-Drop-Makefile.patch -Patch38: 0038-Allow-customizing-lockfile-location-at-configure-tim.patch -Patch39: 0039-extensions-Add-AUDIT-target.patch -Patch40: 0040-Fix-segfault-with-missing-lockfile-directory.patch - BuildRequires: autogen BuildRequires: autoconf BuildRequires: automake @@ -108,7 +66,7 @@ This package provides the systemd ebtables service that has been split out of the base package for better integration with alternatives. %prep -%autosetup -p1 -n ebtables-v%{version}-%{ebminor} +%autosetup -p1 -n ebtables-%{version} # Convert to UTF-8 f=THANKS; iconv -f iso-8859-1 -t utf-8 $f -o $f.utf8 ; mv $f.utf8 $f @@ -205,6 +163,9 @@ manpfx=%{_mandir}/man8/ebtables %ghost %{_sysconfdir}/sysconfig/ebtables %changelog +* Mon Dec 2 2019 Tom Callaway - 2.0.11-1 +- update to 2.0.11 (all of Phil's awesome patches merged) + * Wed Oct 30 2019 Phil Sutter - 2.0.10-39 - Make services sub-package obsolete compat to fix upgrade path diff --git a/sources b/sources index c5a6b45..a7bc584 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -506742a3d44b9925955425a659c1a8d0 ebtables-v2.0.10-4.tar.gz +SHA512 (ebtables-2.0.11.tar.bz2) = 43a04c6174c8028c501591ef260526297e0f018016f226e2a3bcf80766fddf53d4605c347554d6da7c4ab5e2131584a18da20916ffddcbf2d26ac93b00c5777f From 1bd2e64b5e499133714ef5d94ad4a91cc7dfaa44 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Mon, 16 Dec 2019 11:32:21 +0100 Subject: [PATCH 06/26] ebtables-2.0.11-2 - Eliminate implicit dependency on initscripts package --- ebtables-helper | 16 +++++++++++++--- ebtables.spec | 5 ++++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ebtables-helper b/ebtables-helper index 0f5bba9..f1dee08 100644 --- a/ebtables-helper +++ b/ebtables-helper @@ -1,7 +1,16 @@ #!/bin/bash -# Source function library. -. /etc/init.d/functions +# compat for removed initscripts dependency + +success() { + echo "[ OK ]" + return 0 +} + +failure() { + echo "[FAILED]" + return 1 +} # internal variables EBTABLES_CONFIG=/etc/sysconfig/ebtables-config @@ -79,7 +88,8 @@ case $1 in ;; stop) [ "x$EBTABLES_SAVE_ON_STOP" = "xyes" ] && save - action "ebtables: stopping firewall" initialize + echo -n $"ebtables: stopping firewall: " + initialize && success || failure RETVAL=$? rm -f $VAR_SUBSYS_EBTABLES ;; diff --git a/ebtables.spec b/ebtables.spec index 128b2d8..0a97624 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPLv2+ URL: http://ebtables.sourceforge.net/ @@ -163,6 +163,9 @@ manpfx=%{_mandir}/man8/ebtables %ghost %{_sysconfdir}/sysconfig/ebtables %changelog +* Mon Dec 16 2019 Phil Sutter - 2.0.11-2 +- Eliminate implicit dependency on initscripts package + * Mon Dec 2 2019 Tom Callaway - 2.0.11-1 - update to 2.0.11 (all of Phil's awesome patches merged) From b8ff3ec86babdefaf119b20da6ea469020d82a29 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Mon, 16 Dec 2019 16:00:25 +0100 Subject: [PATCH 07/26] ebtables-2.0.11-3 - Fix nft-variant reference in package description --- ebtables.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ebtables.spec b/ebtables.spec index 0a97624..0d9ac61 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPLv2+ URL: http://ebtables.sourceforge.net/ @@ -52,7 +52,7 @@ like iptables. There are no known incompatibility issues. Note that it is considered legacy upstream since nftables provides the same functionality in a much newer code-base. To aid in migration, there is ebtables-nft utility, a drop-in replacement for the legacy one which uses -nftables internally. It is provided by iptables-ebtables package. +nftables internally. It is provided by iptables-nft package. %package services Summary: ebtables systemd services @@ -163,6 +163,9 @@ manpfx=%{_mandir}/man8/ebtables %ghost %{_sysconfdir}/sysconfig/ebtables %changelog +* Mon Dec 16 2019 Phil Sutter - 2.0.11-3 +- Fix nft-variant reference in package description + * Mon Dec 16 2019 Phil Sutter - 2.0.11-2 - Eliminate implicit dependency on initscripts package From 7ed1be2bff2887e4d4283ff935658d1168c515c2 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 22 Jan 2020 13:27:34 -0500 Subject: [PATCH 08/26] add Requires(post): %%{_bindir}/readlink (bz1792805) --- ebtables.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ebtables.spec b/ebtables.spec index 0d9ac61..e50839b 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPLv2+ URL: http://ebtables.sourceforge.net/ @@ -34,6 +34,7 @@ like iptables. There are no known incompatibility issues. %package legacy Summary: Legacy user space tool to configure bridge netfilter rules in kernel Requires(post): %{_sbindir}/update-alternatives +Requires(post): %{_bindir}/readlink Requires(postun): %{_sbindir}/update-alternatives Conflicts: setup < 2.10.4-1 Provides: ebtables @@ -163,6 +164,9 @@ manpfx=%{_mandir}/man8/ebtables %ghost %{_sysconfdir}/sysconfig/ebtables %changelog +* Wed Jan 22 2020 Tom Callaway - 2.0.11-4 +- add Requires(post): %%{_bindir}/readlink (bz1792805) + * Mon Dec 16 2019 Phil Sutter - 2.0.11-3 - Fix nft-variant reference in package description From 00a243eda54b44b3ac10354712562e6e1264e53a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 16:51:23 +0000 Subject: [PATCH 09/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ebtables.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ebtables.spec b/ebtables.spec index e50839b..1f5b0e0 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.11 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPLv2+ URL: http://ebtables.sourceforge.net/ @@ -164,6 +164,9 @@ manpfx=%{_mandir}/man8/ebtables %ghost %{_sysconfdir}/sysconfig/ebtables %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.0.11-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jan 22 2020 Tom Callaway - 2.0.11-4 - add Requires(post): %%{_bindir}/readlink (bz1792805) From 83fc5fd04eb12216d54bd78b24cb3291d8535008 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 16:13:14 +0000 Subject: [PATCH 10/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ebtables.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ebtables.spec b/ebtables.spec index 1f5b0e0..d2c9d46 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.11 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPLv2+ URL: http://ebtables.sourceforge.net/ @@ -164,6 +164,9 @@ manpfx=%{_mandir}/man8/ebtables %ghost %{_sysconfdir}/sysconfig/ebtables %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.0.11-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 2.0.11-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From f9bb517ef6b2a912114c72f3a79bc7875b6fd5e0 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 5 Nov 2020 11:55:37 +0100 Subject: [PATCH 11/26] Remove build dependency on autogen --- ebtables.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ebtables.spec b/ebtables.spec index d2c9d46..fa37df5 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.11 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPLv2+ URL: http://ebtables.sourceforge.net/ @@ -13,7 +13,6 @@ Source2: ebtables-helper Source3: ebtables.service Source4: ebtables-config -BuildRequires: autogen BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -164,6 +163,9 @@ manpfx=%{_mandir}/man8/ebtables %ghost %{_sysconfdir}/sysconfig/ebtables %changelog +* Thu Nov 5 2020 Florian Weimer - 2.0.11-7 +- Remove build dependency on autogen + * Mon Jul 27 2020 Fedora Release Engineering - 2.0.11-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 0ca381ddb7a5846d6e7993bdccc208449dd1404c Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 17 Dec 2020 04:53:52 +0000 Subject: [PATCH 12/26] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- ebtables.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ebtables.spec b/ebtables.spec index fa37df5..722e0d4 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -18,6 +18,7 @@ BuildRequires: automake BuildRequires: libtool BuildRequires: gcc BuildRequires: systemd +BuildRequires: make %description Ethernet bridge tables is a firewalling tool to transparently filter network From 1361d01d7ec46353e77905ce91287b9502f5d2a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 04:13:54 +0000 Subject: [PATCH 13/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ebtables.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ebtables.spec b/ebtables.spec index 722e0d4..2aa1337 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.11 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPLv2+ URL: http://ebtables.sourceforge.net/ @@ -164,6 +164,9 @@ manpfx=%{_mandir}/man8/ebtables %ghost %{_sysconfdir}/sysconfig/ebtables %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.0.11-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Nov 5 2020 Florian Weimer - 2.0.11-7 - Remove build dependency on autogen From 2ccfd763795166e1600dcc7c714e9d4d5f4bb9cd Mon Sep 17 00:00:00 2001 From: Eric Garver Date: Tue, 26 Jan 2021 13:39:12 -0500 Subject: [PATCH 14/26] avoid Provides: ebtables for newer RHEL/ELN builds --- ebtables.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ebtables.spec b/ebtables.spec index 2aa1337..467a58e 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.11 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPLv2+ URL: http://ebtables.sourceforge.net/ @@ -37,7 +37,13 @@ Requires(post): %{_sbindir}/update-alternatives Requires(post): %{_bindir}/readlink Requires(postun): %{_sbindir}/update-alternatives Conflicts: setup < 2.10.4-1 +%if 0%{?rhel} >= 9 +# RHEL-9 provides ebtables via iptables-nft, but doesn't support ebtables +# alternatives. As such avoid the Provides here so iptables-nft is chosen, not +# ebtables-legacy. +%else Provides: ebtables +%endif %description legacy Ethernet bridge tables is a firewalling tool to transparently filter network @@ -164,6 +170,9 @@ manpfx=%{_mandir}/man8/ebtables %ghost %{_sysconfdir}/sysconfig/ebtables %changelog +* Tue Jan 26 2021 Eric Garver - 2.0.11-9 +- avoid Provides: ebtables for newer RHEL/ELN builds + * Tue Jan 26 2021 Fedora Release Engineering - 2.0.11-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 42fc61e3792534cd5af562ee2ba8f739feee9f5e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 21:35:27 +0000 Subject: [PATCH 15/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ebtables.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ebtables.spec b/ebtables.spec index 467a58e..0151821 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.11 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPLv2+ URL: http://ebtables.sourceforge.net/ @@ -170,6 +170,9 @@ manpfx=%{_mandir}/man8/ebtables %ghost %{_sysconfdir}/sysconfig/ebtables %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 2.0.11-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Eric Garver - 2.0.11-9 - avoid Provides: ebtables for newer RHEL/ELN builds From ba0520fe9b580999f2e030ce6b0145185a3b2c28 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 01:34:37 +0000 Subject: [PATCH 16/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ebtables.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ebtables.spec b/ebtables.spec index 0151821..02bda4c 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.11 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPLv2+ URL: http://ebtables.sourceforge.net/ @@ -170,6 +170,9 @@ manpfx=%{_mandir}/man8/ebtables %ghost %{_sysconfdir}/sysconfig/ebtables %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.0.11-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 2.0.11-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 657e0f292c00c8d78462304a853f7ebf9990c452 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 01:33:50 +0000 Subject: [PATCH 17/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ebtables.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ebtables.spec b/ebtables.spec index 02bda4c..9aa188f 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.11 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPLv2+ URL: http://ebtables.sourceforge.net/ @@ -170,6 +170,9 @@ manpfx=%{_mandir}/man8/ebtables %ghost %{_sysconfdir}/sysconfig/ebtables %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 2.0.11-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 2.0.11-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From dec3491bac598598756d6d807d629b5aa92a4b72 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 02:02:49 +0000 Subject: [PATCH 18/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ebtables.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ebtables.spec b/ebtables.spec index 9aa188f..46dc974 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.11 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPLv2+ URL: http://ebtables.sourceforge.net/ @@ -170,6 +170,9 @@ manpfx=%{_mandir}/man8/ebtables %ghost %{_sysconfdir}/sysconfig/ebtables %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.0.11-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 2.0.11-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 514fa36eaee15da3276ae6c1735dff181c3e4c12 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 18:10:07 +0000 Subject: [PATCH 19/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ebtables.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ebtables.spec b/ebtables.spec index 46dc974..b4f10e6 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.11 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPLv2+ URL: http://ebtables.sourceforge.net/ @@ -170,6 +170,9 @@ manpfx=%{_mandir}/man8/ebtables %ghost %{_sysconfdir}/sysconfig/ebtables %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.0.11-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 2.0.11-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 9f7e02fb9ae0163973d02f438075a5ccb725971a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 17:48:19 +0000 Subject: [PATCH 20/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ebtables.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ebtables.spec b/ebtables.spec index b4f10e6..bd7e951 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.11 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPLv2+ URL: http://ebtables.sourceforge.net/ @@ -170,6 +170,9 @@ manpfx=%{_mandir}/man8/ebtables %ghost %{_sysconfdir}/sysconfig/ebtables %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.0.11-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 2.0.11-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 077f7949b26bd54f8cbe7df5d5cafd0fdbd873b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 10:05:02 +0000 Subject: [PATCH 21/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ebtables.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ebtables.spec b/ebtables.spec index bd7e951..22cdb39 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.11 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPLv2+ URL: http://ebtables.sourceforge.net/ @@ -170,6 +170,9 @@ manpfx=%{_mandir}/man8/ebtables %ghost %{_sysconfdir}/sysconfig/ebtables %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 2.0.11-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.0.11-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From dd79ac71575c3b6b28a2167c055c053e7e9192bf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 21:39:53 +0000 Subject: [PATCH 22/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ebtables.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ebtables.spec b/ebtables.spec index 22cdb39..7a4ad48 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.11 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPLv2+ URL: http://ebtables.sourceforge.net/ @@ -170,6 +170,9 @@ manpfx=%{_mandir}/man8/ebtables %ghost %{_sysconfdir}/sysconfig/ebtables %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 2.0.11-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 2.0.11-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 04c5af76832f8261125d3dff5fac14b62b138e99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 23:36:53 +0200 Subject: [PATCH 23/26] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- ebtables.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ebtables.spec b/ebtables.spec index 7a4ad48..611ba98 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -2,9 +2,10 @@ Name: ebtables Version: 2.0.11 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Ethernet Bridge frame table administration tool -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://ebtables.sourceforge.net/ Source0: ftp://ftp.netfilter.org/pub/ebtables/ebtables-%{version}.tar.bz2 @@ -170,6 +171,9 @@ manpfx=%{_mandir}/man8/ebtables %ghost %{_sysconfdir}/sysconfig/ebtables %changelog +* Thu Jul 25 2024 Miroslav Suchý - 2.0.11-18 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 2.0.11-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 8f16582823ee3ac38acbee08d0b9e05c4e82376b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 16:34:20 +0000 Subject: [PATCH 24/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ebtables.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ebtables.spec b/ebtables.spec index 611ba98..6010a46 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.11 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Ethernet Bridge frame table administration tool # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -171,6 +171,9 @@ manpfx=%{_mandir}/man8/ebtables %ghost %{_sysconfdir}/sysconfig/ebtables %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.0.11-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 25 2024 Miroslav Suchý - 2.0.11-18 - convert license to SPDX From 911a7c974023cdd92b6198c214b61de41921d2a4 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 4 Apr 2025 13:18:42 +0200 Subject: [PATCH 25/26] ebtables-2.0.11-20 - Drop ebtables-services package - Add fixes/hooks for bin-sbin merge, analogous to iptables.spec --- ebtables-config | 11 ----- ebtables-helper | 105 ----------------------------------------------- ebtables.service | 11 ----- ebtables.spec | 74 ++++++++++----------------------- 4 files changed, 21 insertions(+), 180 deletions(-) delete mode 100644 ebtables-config delete mode 100644 ebtables-helper delete mode 100644 ebtables.service diff --git a/ebtables-config b/ebtables-config deleted file mode 100644 index 69d9289..0000000 --- a/ebtables-config +++ /dev/null @@ -1,11 +0,0 @@ -# Save current firewall rules on stop. -# Value: yes|no, default: no -# Saves all firewall rules if firewall gets stopped -# (e.g. on system shutdown). -EBTABLES_SAVE_ON_STOP="no" - -# Save (and restore) rule counters. -# Value: yes|no, default: no -# Save rule counters when saving a kernel table to a file. If the -# rule counters were saved, they will be restored when restoring the table. -EBTABLES_SAVE_COUNTER="no" diff --git a/ebtables-helper b/ebtables-helper deleted file mode 100644 index f1dee08..0000000 --- a/ebtables-helper +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash - -# compat for removed initscripts dependency - -success() { - echo "[ OK ]" - return 0 -} - -failure() { - echo "[FAILED]" - return 1 -} - -# internal variables -EBTABLES_CONFIG=/etc/sysconfig/ebtables-config -EBTABLES_DATA=/etc/sysconfig/ebtables -EBTABLES_TABLES="filter nat" -if ebtables --version | grep -q '(legacy)'; then - EBTABLES_TABLES+=" broute" -fi -VAR_SUBSYS_EBTABLES=/var/lock/subsys/ebtables - -# ebtables-config defaults -EBTABLES_SAVE_ON_STOP="no" -EBTABLES_SAVE_ON_RESTART="no" -EBTABLES_SAVE_COUNTER="no" - -# load config if existing -[ -f "$EBTABLES_CONFIG" ] && . "$EBTABLES_CONFIG" - -initialize() { - local ret=0 - for table in $EBTABLES_TABLES; do - ebtables -t $table --init-table || ret=1 - done - return $ret -} - -sanitize_dump() { - local drop=false - - export EBTABLES_TABLES - - cat $1 | while read line; do - case $line in - \**) - drop=false - local table="${line#\*}" - local found=false - for t in $EBTABLES_TABLES; do - if [[ $t == $table ]]; then - found=true - break - fi - done - $found || drop=true - ;; - esac - $drop || echo "$line" - done -} - -start() { - if [ -f $EBTABLES_DATA ]; then - echo -n $"ebtables: loading ruleset from $EBTABLES_DATA: " - sanitize_dump $EBTABLES_DATA | ebtables-restore - else - echo -n $"ebtables: no stored ruleset, initializing empty tables: " - initialize - fi - local ret=$? - touch $VAR_SUBSYS_EBTABLES - return $ret -} - -save() { - echo -n $"ebtables: saving active ruleset to $EBTABLES_DATA: " - export EBTABLES_SAVE_COUNTER - ebtables-save >$EBTABLES_DATA && success || failure -} - -case $1 in - start) - [ -f "$VAR_SUBSYS_EBTABLES" ] && exit 0 - start && success || failure - RETVAL=$? - ;; - stop) - [ "x$EBTABLES_SAVE_ON_STOP" = "xyes" ] && save - echo -n $"ebtables: stopping firewall: " - initialize && success || failure - RETVAL=$? - rm -f $VAR_SUBSYS_EBTABLES - ;; - save) - save - ;; - *) - echo "usage: ${0##*/} {start|stop|save}" >&2 - RETVAL=2 - ;; -esac - -exit $RETVAL diff --git a/ebtables.service b/ebtables.service deleted file mode 100644 index b096f1d..0000000 --- a/ebtables.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Ethernet Bridge Filtering tables - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/libexec/ebtables-helper start -ExecStop=/usr/libexec/ebtables-helper stop - -[Install] -WantedBy=multi-user.target diff --git a/ebtables.spec b/ebtables.spec index 6010a46..2c472fc 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.11 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Ethernet Bridge frame table administration tool # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -10,16 +10,12 @@ URL: http://ebtables.sourceforge.net/ Source0: ftp://ftp.netfilter.org/pub/ebtables/ebtables-%{version}.tar.bz2 Source1: ebtables-legacy-save -Source2: ebtables-helper -Source3: ebtables.service -Source4: ebtables-config BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool BuildRequires: gcc -BuildRequires: systemd -BuildRequires: make +BuildRequires: make %description Ethernet bridge tables is a firewalling tool to transparently filter network @@ -34,9 +30,9 @@ like iptables. There are no known incompatibility issues. %package legacy Summary: Legacy user space tool to configure bridge netfilter rules in kernel -Requires(post): %{_sbindir}/update-alternatives +Requires(post): /usr/sbin/update-alternatives Requires(post): %{_bindir}/readlink -Requires(postun): %{_sbindir}/update-alternatives +Requires(postun): /usr/sbin/update-alternatives Conflicts: setup < 2.10.4-1 %if 0%{?rhel} >= 9 # RHEL-9 provides ebtables via iptables-nft, but doesn't support ebtables @@ -46,6 +42,8 @@ Conflicts: setup < 2.10.4-1 Provides: ebtables %endif +%sbin_merge_compat %{_prefix}/sbin/ebtables + %description legacy Ethernet bridge tables is a firewalling tool to transparently filter network traffic passing a bridge. The filtering possibilities are limited to link @@ -62,17 +60,6 @@ functionality in a much newer code-base. To aid in migration, there is ebtables-nft utility, a drop-in replacement for the legacy one which uses nftables internally. It is provided by iptables-nft package. -%package services -Summary: ebtables systemd services -%{?systemd_ordering} -Obsoletes: ebtables-compat < 2.0.10-39 - -%description services -ebtables systemd services - -This package provides the systemd ebtables service that has been split -out of the base package for better integration with alternatives. - %prep %autosetup -p1 -n ebtables-%{version} # Convert to UTF-8 @@ -85,10 +72,6 @@ f=THANKS; iconv -f iso-8859-1 -t utf-8 $f -o $f.utf8 ; mv $f.utf8 $f %install %make_install -install -D -m 644 %{SOURCE3} %{buildroot}%{_unitdir}/ebtables.service -install -D -m 755 %{SOURCE2} %{buildroot}%{_libexecdir}/ebtables-helper -install -D -m 600 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/ebtables-config -touch %{buildroot}%{_sysconfdir}/sysconfig/ebtables # install ebtables-legacy-save bash script install -m 755 %{SOURCE1} %{buildroot}%{_sbindir}/ebtables-legacy-save @@ -102,14 +85,8 @@ rm -f %{buildroot}%{_sysconfdir}/ethertypes # Drop these binaries (for now at least) rm %{buildroot}/%{_sbindir}/ebtables{d,u} -# Prepare for Alternatives system -touch %{buildroot}%{_sbindir}/ebtables -touch %{buildroot}%{_sbindir}/ebtables-save -touch %{buildroot}%{_sbindir}/ebtables-restore -touch %{buildroot}%{_mandir}/man8/ebtables.8 - %post legacy -pfx=%{_sbindir}/ebtables +pfx=%{_prefix}/sbin/ebtables manpfx=%{_mandir}/man8/ebtables for sfx in "" "-restore" "-save"; do if [ "$(readlink -e $pfx$sfx)" == $pfx$sfx ]; then @@ -119,7 +96,9 @@ done if [ "$(readlink -e $manpfx.8.gz)" == $manpfx.8.gz ]; then rm -f $manpfx.8.gz fi -%{_sbindir}/update-alternatives --install \ +# drop the extra entry linking to /usr/bin which previous version installed +update-alternatives --remove ebtables /usr/bin/ebtables-legacy 2>/dev/null +update-alternatives --install \ $pfx ebtables $pfx-legacy 10 \ --slave $pfx-save ebtables-save $pfx-legacy-save \ --slave $pfx-restore ebtables-restore $pfx-legacy-restore \ @@ -128,49 +107,38 @@ fi %postun legacy if [ $1 -eq 0 ]; then %{_sbindir}/update-alternatives --remove \ - ebtables %{_sbindir}/ebtables-legacy + ebtables %{_prefix}/sbin/ebtables-legacy fi # When upgrading ebtables to ebtables-{legacy,services}, # postun in ebtables thinks it is uninstalled and removes alternatives. # Counter this with a trigger here to have it installed again. %triggerpostun legacy -- ebtables -pfx=%{_sbindir}/ebtables +pfx=%{_prefix}/sbin/ebtables manpfx=%{_mandir}/man8/ebtables -%{_sbindir}/update-alternatives --install \ +update-alternatives --install \ $pfx ebtables $pfx-legacy 10 \ --slave $pfx-save ebtables-save $pfx-legacy-save \ --slave $pfx-restore ebtables-restore $pfx-legacy-restore \ --slave $manpfx.8.gz ebtables-man $manpfx-legacy.8.gz -%post services -%systemd_post ebtables.service - -%preun services -%systemd_preun ebtables.service - -%postun services -%systemd_postun ebtables.service - %files legacy %license COPYING %doc ChangeLog THANKS %{_sbindir}/ebtables-legacy* %{_mandir}/*/ebtables-legacy* %{_libdir}/libebtc.so* -%ghost %{_sbindir}/ebtables -%ghost %{_sbindir}/ebtables-save -%ghost %{_sbindir}/ebtables-restore -%ghost %{_mandir}/man8/ebtables.8.gz - -%files services -%{_unitdir}/ebtables.service -%{_libexecdir}/ebtables-helper -%config(noreplace) %{_sysconfdir}/sysconfig/ebtables-config -%ghost %{_sysconfdir}/sysconfig/ebtables +%ghost %attr(0755,root,root) %{_prefix}/sbin/ebtables +%ghost %attr(0755,root,root) %{_prefix}/sbin/ebtables-save +%ghost %attr(0755,root,root) %{_prefix}/sbin/ebtables-restore +%ghost %attr(0644,root,root) %{_mandir}/man8/ebtables.8.gz %changelog +* Thu Apr 03 2025 Phil Sutter - 2.0.11-20 +- Drop ebtables-services package +- Add fixes/hooks for bin-sbin merge, analogous to iptables.spec + * Thu Jan 16 2025 Fedora Release Engineering - 2.0.11-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From f527942e58c46d07d3096889039c064d9fe04ad7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 19:40:59 +0000 Subject: [PATCH 26/26] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ebtables.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ebtables.spec b/ebtables.spec index 2c472fc..87b84e2 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.11 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Ethernet Bridge frame table administration tool # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -135,6 +135,9 @@ update-alternatives --install \ %ghost %attr(0644,root,root) %{_mandir}/man8/ebtables.8.gz %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2.0.11-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Apr 03 2025 Phil Sutter - 2.0.11-20 - Drop ebtables-services package - Add fixes/hooks for bin-sbin merge, analogous to iptables.spec