- Fixed ebtables-restore does not support the COMMIT command issue

This commit is contained in:
Thomas Woerner 2016-05-09 15:26:35 +02:00
parent a81efa3c56
commit 07c6568ae0
2 changed files with 24 additions and 1 deletions

View File

@ -0,0 +1,18 @@
commit 7dd6f72f26515d9b0ebab0c95628470a1caa8df8
Author: Thomas Woerner <twoerner@redhat.com>
Date: Mon May 9 15:18:40 2016 +0200
firewall.core.ebtables: ebtables-restore does not support the COMMIT command
diff --git a/src/firewall/core/ebtables.py b/src/firewall/core/ebtables.py
index aef40e1..72886f4 100644
--- a/src/firewall/core/ebtables.py
+++ b/src/firewall/core/ebtables.py
@@ -127,7 +127,6 @@ class ebtables(object):
temp_file.write("*%s\n" % table)
for rule in table_rules[table]:
temp_file.write(" ".join(rule) + "\n")
- temp_file.write("COMMIT\n")
temp_file.close()

View File

@ -8,7 +8,7 @@
Summary: A firewall daemon with D-Bus interface providing a dynamic firewall Summary: A firewall daemon with D-Bus interface providing a dynamic firewall
Name: firewalld Name: firewalld
Version: 0.4.1.2 Version: 0.4.1.2
Release: 1%{?dist} Release: 2%{?dist}
URL: http://www.firewalld.org URL: http://www.firewalld.org
License: GPLv2+ License: GPLv2+
Source0: https://fedorahosted.org/released/firewalld/%{name}-%{version}.tar.bz2 Source0: https://fedorahosted.org/released/firewalld/%{name}-%{version}.tar.bz2
@ -18,6 +18,7 @@ Source2: FedoraWorkstation.xml
%endif %endif
%if 0%{?fedora} %if 0%{?fedora}
Patch0: firewalld-0.2.6-MDNS-default.patch Patch0: firewalld-0.2.6-MDNS-default.patch
Patch1: firewalld-0.4.1.2-ebtables_no_COMMIT.patch
%endif %endif
BuildArch: noarch BuildArch: noarch
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
@ -173,6 +174,7 @@ Workstation product specific firewalld configuration settings.
%setup -q %setup -q
%if 0%{?fedora} %if 0%{?fedora}
%patch0 -p1 %patch0 -p1
%patch1 -p1
%endif %endif
%if 0%{?with_python3} %if 0%{?with_python3}
@ -485,6 +487,9 @@ fi
%endif %endif
%changelog %changelog
* Mon May 9 2016 Thomas Woerner <twoerner@redhat.com> - 0.4.1.2-2
- Fixed ebtables-restore does not support the COMMIT command issue
* Wed Apr 20 2016 Thomas Woerner <twoerner@redhat.com> - 0.4.1.2-1 * Wed Apr 20 2016 Thomas Woerner <twoerner@redhat.com> - 0.4.1.2-1
- Fixed translations with python3 - Fixed translations with python3
- Fixed exception for failed NM import, new doc string - Fixed exception for failed NM import, new doc string