diff --git a/.gitignore b/.gitignore index 932d297..a304dbd 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /firewalld-0.4.0.tar.bz2 /firewalld-0.4.1.tar.bz2 /firewalld-0.4.1.2.tar.bz2 +/firewalld-0.4.2.tar.bz2 diff --git a/firewalld-0.4.1.2-ebtables_no_COMMIT.patch b/firewalld-0.4.1.2-ebtables_no_COMMIT.patch deleted file mode 100644 index 7f21fb7..0000000 --- a/firewalld-0.4.1.2-ebtables_no_COMMIT.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit 7dd6f72f26515d9b0ebab0c95628470a1caa8df8 -Author: Thomas Woerner -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() - diff --git a/firewalld.spec b/firewalld.spec index 6f02cef..010f0a8 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.4.1.2 -Release: 2%{?dist} +Version: 0.4.2 +Release: 1%{?dist} URL: http://www.firewalld.org License: GPLv2+ Source0: https://fedorahosted.org/released/firewalld/%{name}-%{version}.tar.bz2 @@ -18,7 +18,6 @@ Source2: FedoraWorkstation.xml %endif %if 0%{?fedora} Patch0: firewalld-0.2.6-MDNS-default.patch -Patch1: firewalld-0.4.1.2-ebtables_no_COMMIT.patch %endif BuildArch: noarch BuildRequires: desktop-file-utils @@ -174,7 +173,6 @@ Workstation product specific firewalld configuration settings. %setup -q %if 0%{?fedora} %patch0 -p1 -%patch1 -p1 %endif %if 0%{?with_python3} @@ -389,6 +387,9 @@ fi %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/icmptypes %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/services %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/zones +%dir %{_datadir}/firewalld +%dir %{_datadir}/firewalld/tests +%{_datadir}/firewalld/tests %defattr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/firewalld %{_unitdir}/firewalld.service @@ -463,6 +464,7 @@ fi %defattr(0644,root,root) %{_datadir}/firewalld/firewall-config.glade %{_datadir}/firewalld/gtk3_chooserbutton.py* +%{_datadir}/firewalld/gtk3_niceexpander.py* %{_datadir}/applications/firewall-config.desktop %{_datadir}/appdata/firewall-config.appdata.xml %{_datadir}/icons/hicolor/*/apps/firewall-config*.* @@ -487,6 +489,45 @@ fi %endif %changelog +* Mon May 30 2016 Thomas Woerner - 0.4.2-1 +- New module to search for and change ifcfg files for interfaces not under + control of NM +- firewall_config: Enhanced messages in status bar +- firewall-config: New message window as overlay if not connected +- firewall-config: Fix sentivity of option, view menus and main paned if not + connected +- firewall-applet: Quit on SIGINT (Ctrl-C), reduced D-Bus calls, some cleanup +- firewall-[offline]cmd: Show target in zone information +- D-Bus: Completed masquerade methods in FirewallClientZoneSettings +- Fixed log-denied rules for icmp-blocks +- Keep sorting of interfaces, services, icmp-blocks and other settings in zones +- Fixed runtime-to-permanent not to save interfaces under control of NM +- New icmp-block-inversion flag in the zones +- ICMP type filtering in the zones +- New services: sip, sips, managesieve +- rich rules: Allow destination action (RHBZ#1163428) +- firewall-offline-cmd: New option -q/--quiet +- firewall-[offline-]cmd: New --add-[zone,service,ipset,icmptype]-from-file +- firewall-[offline-]cmd: Fix option for setting the destination address +- firewall-config: Fixed resizing behaviour +- New transaction model for speed ups in start, restart, stop and other actions +- firewall-cmd: New options --load{zone,service,ipset,icmptype}-defaults +- Fixed memory leak in dbus_introspection_add_properties +- Landscape.io fixes, pylint calm downs +- New D-Bus getXnames methods to speed up firewall-config and firewall-cmd +- ebtables-restore: No support for COMMIT command +- Source port support in services, zones and rich rules +- firewall-offline-cmd: Added --{add,remove}-entries-from-file for ipsets +- firewall-config: New active bindings side bar for simple binding changes +- Reworked NetworkManager module +- Proper default zone handling for NM connections +- Try to set zone binding with NM if interface is under control of NM +- Code cleanup and bug fixes +- Include test suite in the release and install in /usr/share/firewalld/tests +- New Travis-CI configuration file +- Fixed more broken frensh translations +- Translation updates + * Mon May 9 2016 Thomas Woerner - 0.4.1.2-2 - Fixed ebtables-restore does not support the COMMIT command issue diff --git a/sources b/sources index 9e40ce2..0350e5b 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ f0a24194b017a7d11eafa22e85829cc9 firewalld-0.4.1.2.tar.bz2 +21983c929bd5061df73408a11cb3a8fd firewalld-0.4.2.tar.bz2