diff --git a/firewalld-0.3.13-python3.patch b/firewalld-0.3.13-python3.patch deleted file mode 100644 index 937e874..0000000 --- a/firewalld-0.3.13-python3.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/firewall/core/io/direct.py b/src/firewall/core/io/direct.py -index 16cfe0c..ebbc19a 100644 ---- a/src/firewall/core/io/direct.py -+++ b/src/firewall/core/io/direct.py -@@ -327,8 +327,8 @@ class Direct(IO_Object): - if len(self.passthroughs[ipv]) == 0: - del self.passthroughs[ipv] - else: -- raise ValueError, "Passthrough '%s' for ipv '%s'" % \ -- ("',".join(args), ipv) + "not in list" -+ raise ValueError("Passthrough '%s' for ipv '%s'" % \ -+ ("',".join(args), ipv) + "not in list") - - def query_passthrough(self, ipv, args): - self._check_ipv(ipv) -@@ -339,7 +339,7 @@ class Direct(IO_Object): - if ipv in self.passthroughs: - return self.passthroughs[ipv] - else: -- raise ValueError, "No passthroughs for ipv '%s'" % (ipv) -+ raise ValueError("No passthroughs for ipv '%s'" % (ipv)) - - def get_all_passthroughs(self): - return self.passthroughs diff --git a/firewalld.spec b/firewalld.spec index dd68063..b4b7ebe 100644 --- a/firewalld.spec +++ b/firewalld.spec @@ -7,8 +7,8 @@ Summary: A firewall daemon with D-Bus interface providing a dynamic firewall Name: firewalld -Version: 0.3.13 -Release: 7%{?dist} +Version: 0.3.14.1 +Release: 1%{?dist} URL: http://www.firewalld.org License: GPLv2+ Source0: https://fedorahosted.org/released/firewalld/%{name}-%{version}.tar.bz2 @@ -19,7 +19,6 @@ Source2: FedoraWorkstation.xml %if 0%{?fedora} Patch0: firewalld-0.2.6-MDNS-default.patch %endif -Patch1: firewalld-0.3.13-python3.patch BuildArch: noarch BuildRequires: desktop-file-utils BuildRequires: gettext @@ -40,7 +39,7 @@ Requires: firewalld-filesystem = %{version}-%{release} %if 0%{?use_python3} Requires: python3-firewall = %{version}-%{release} %else #0%{?use_python3} -Requires: python2-firewall = %{version}-%{release} +Requires: python-firewall = %{version}-%{release} %endif #0%{?use_python3} Provides: variant_config(Server) @@ -56,14 +55,16 @@ Obsoletes: firewalld-config-workstation <= 0.3.13 firewalld is a firewall service daemon that provides a dynamic customizable firewall with a D-Bus interface. -%package -n python2-firewall +%package -n python-firewall Summary: Python2 bindings for firewalld +Provides: python2-firewall +Obsoletes: python2-firewall Requires: dbus-python Requires: python-slip-dbus Requires: python-decorator Requires: pygobject3-base -%description -n python2-firewall +%description -n python-firewall Python2 bindings for firewalld. %if 0%{?with_python3} @@ -90,8 +91,13 @@ Summary: Firewall panel applet Requires: %{name} = %{version}-%{release} Requires: firewall-config = %{version}-%{release} Requires: hicolor-icon-theme -Requires: gtk3 +%if 0%{?with_python3} +Requires: python3-PyQt4 +Requires: python3-gobject +%else +Requires: PyQt4 Requires: pygobject3-base +%endif Requires: libnotify Requires: NetworkManager-glib @@ -104,7 +110,11 @@ Summary: Firewall configuration application Requires: %{name} = %{version}-%{release} Requires: hicolor-icon-theme Requires: gtk3 +%if 0%{?with_python3} +Requires: python3-gobject +%else Requires: pygobject3-base +%endif Requires: NetworkManager-glib %description -n firewall-config @@ -116,7 +126,6 @@ firewalld. %if 0%{?fedora} %patch0 -p1 %endif -%patch1 -p1 %if 0%{?with_python3} rm -rf %{py3dir} @@ -282,7 +291,7 @@ fi %{_mandir}/man1/firewalld*.1* %{_mandir}/man5/firewall*.5* -%files -n python2-firewall +%files -n python-firewall %attr(0755,root,root) %dir %{python2_sitelib}/firewall %attr(0755,root,root) %dir %{python2_sitelib}/firewall/config %attr(0755,root,root) %dir %{python2_sitelib}/firewall/core @@ -331,7 +340,6 @@ fi %defattr(0644,root,root) %{_sysconfdir}/xdg/autostart/firewall-applet.desktop %{_datadir}/icons/hicolor/*/apps/firewall-applet*.* -%{_datadir}/glib-2.0/schemas/org.fedoraproject.FirewallApplet.gschema.xml %{_mandir}/man1/firewall-applet*.1* %files -n firewall-config @@ -346,6 +354,54 @@ fi %{_mandir}/man1/firewall-config*.1* %changelog +* Fri Jun 12 2015 Thomas Woerner - 0.3.14.1-1 +- firewall-applet + - do not use isSystemTrayAvailable check to fix KDE5 startup + - dropped gtk applet remain: org.fedoraproject.FirewallApplet.gschema.xml + +* Fri Jun 12 2015 Thomas Woerner - 0.3.14-1 +- renamed python2-firewall to python-firewall +- fixed requirements for GUI parts with Python3 +- dropped upstream merged python3 patch +- firewalld: + - print real zone names in error messages + - iptables 1.4.21 does not accept limits of 1/day, minimum is 2/day now + - rate limit fix for rich rules + - fix readdition of removed permanent direct settings + - adaption of the polkit domains to use PK_ACTION_DIRECT_INFO + - fixed two minor Python3 issues in firewall.core.io.direct + - fixed use of fallback configuration values + - fixed use without firewalld.conf + - firewalld main restructureization + - IPv6_rpfilter now also available as a property on D-Bus in the config interface + - fixed wait option use for ipXtables + - added --concurrent support for ebtables + - richLanguage: allow masquerading with destination + - richLanguage: limit masquerading forward rule to new connections + - ipXtables: No dns lookups in available_tables and _detect_wait_option + - full ebtables support: start, stop, reload, panic mode, direct chains and rules + - fix for reload with direct rules + - fix or flaws found by landscape.io + - pid file handling fixes in case of pid file removal + - fix for client issue in case of a dbus NoReply error +- configuration + - new services: dropbox-lansync, ptp + - new icmptypes: timestamp-request, timestamp-reply +- man pages: + - firewalld.zones(5): fixed typos + - firewalld.conf(5): Fixed wrong reference to firewalld.lockdown-whitelist page +- firewall-applet: + - new version using Qt4 fixing several issues with the Gtk version +- spec file: + - enabled Python3 support: new backends python-firewall and python3-firewall + - some cleanup +- git: + - migrated to github +- translations: + - migrated to zanata +- build environment: + - no need for autoconf-2.69, 2.68 is sufficient + * Thu May 07 2015 Stephen Gallagher 0.3.13-7 - Use VARIANT_ID instead of VARIANT for making decisions