diff --git a/firewalld-0.3.3-rich_rule_import.patch b/firewalld-0.3.3-rich_rule_import.patch new file mode 100644 index 0000000..e236d52 --- /dev/null +++ b/firewalld-0.3.3-rich_rule_import.patch @@ -0,0 +1,20 @@ +commit f428939c42560ba3aad5c2bfa5b95bb8185d75ed +Author: Thomas Woerner +Date: Fri Jun 7 12:48:56 2013 +0200 + + Use Rich_Rule.check in _import_from_string + +diff --git a/src/firewall/core/rich.py b/src/firewall/core/rich.py +index fd27914..a643d16 100644 +--- a/src/firewall/core/rich.py ++++ b/src/firewall/core/rich.py +@@ -418,8 +418,7 @@ class Rich_Rule(object): + + index = index + 1 + +- if not self.element: +- raise FirewallError(INVALID_RULE, "no element") ++ self.check() + + def check(self): + if self.family != None and self.family not in [ "ipv4", "ipv6" ]: diff --git a/firewalld.spec b/firewalld.spec index 146a342..d638a74 100644 --- a/firewalld.spec +++ b/firewalld.spec @@ -1,7 +1,7 @@ Summary: A firewall daemon with D-BUS interface providing a dynamic firewall Name: firewalld Version: 0.3.3 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://fedorahosted.org/firewalld License: GPLv2+ ExclusiveOS: Linux @@ -11,6 +11,7 @@ Source0: https://fedorahosted.org/released/firewalld/%{name}-%{version}.tar.bz2 %if 0%{?fedora} > 17 Patch0: firewalld-0.2.6-MDNS-default.patch %endif +Patch1: firewalld-0.3.3-rich_rule_import.patch BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: intltool @@ -75,6 +76,7 @@ firewalld. %if 0%{?fedora} > 17 %patch0 -p1 %endif +%patch1 -p1 -b .rich_rule_import %build %configure --enable-sysconfig @@ -194,6 +196,9 @@ fi %{_datadir}/icons/hicolor/*/apps/firewall-config*.* %changelog +* Fri Jun 7 2013 Thomas Woerner 0.3.3-2 +- Fixed rich rule check for use in D-Bus + * Thu Jun 6 2013 Thomas Woerner 0.3.3-1 - new service files - relicensed logger.py under GPLv2+