[firewalld/f21: 2/2] Merge branch 'f20' into f21

[Jiří Popelka]

commit f70602740cef0ce3815d2cf6c1e8580f5f60076b
Merge: 68cca00 959b2db
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Dec 4 19:22:47 2014 +0100

    Merge branch 'f20' into f21

 .gitignore     |    1 +
 firewalld.spec |   43 +++++++++++++++++++++++++++++++++++++------
 sources        |    2 +-
 3 files changed, 39 insertions(+), 7 deletions(-)
---
diff --cc firewalld.spec
index 0877aab,2bd25c2..dd78895
--- a/firewalld.spec
+++ b/firewalld.spec
@@@ -26,7 -24,7 +26,8 @@@ Requires: iptables, ebtable
  Requires(post): systemd
  Requires(preun): systemd
  Requires(postun): systemd
+ Requires: firewalld-filesystem = %{version}-%{release}
 +Requires: firewalld-config
  
  %description
  firewalld is a firewall service daemon that provides a dynamic customizable 
@@@ -232,15 -133,9 +240,11 @@@ f
  %{_prefix}/lib/firewalld/icmptypes/*.xml
  %{_prefix}/lib/firewalld/services/*.xml
  %{_prefix}/lib/firewalld/zones/*.xml
+ %{_prefix}/lib/firewalld/xmlschema/*.xsd
  %attr(0750,root,root) %dir %{_sysconfdir}/firewalld
 +%if 0%{?fedora} <= 20
  %config(noreplace) %{_sysconfdir}/firewalld/firewalld.conf
 +%endif
  %config(noreplace) %{_sysconfdir}/firewalld/lockdown-whitelist.xml
  %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/icmptypes
  %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/services
@@@ -286,24 -189,27 +297,44 @@@
  %{_datadir}/glib-2.0/schemas/org.fedoraproject.FirewallConfig.gschema.xml
  %{_mandir}/man1/firewall-config*.1*
  
 +%if 0%{?fedora} > 20
 +%files config-standard
 +%config(noreplace) %{_sysconfdir}/firewalld/firewalld-standard.conf
 +%ghost %config(noreplace) %{_sysconfdir}/firewalld/firewalld.conf
 +%ghost %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy
 +
 +%files config-server
 +%config(noreplace) %{_sysconfdir}/firewalld/firewalld-server.conf
 +%ghost %config(noreplace) %{_sysconfdir}/firewalld/firewalld.conf
 +%ghost %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy
 +
 +%files config-workstation
 +%config(noreplace) %{_sysconfdir}/firewalld/firewalld-workstation.conf
 +%ghost %config(noreplace) %{_sysconfdir}/firewalld/firewalld.conf
 +%ghost %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy
 +%endif
 +
  %changelog
+ * Thu Dec 04 2014 Jiri Popelka <jpopelka at redhat.com> - 0.3.13-1
+ - firewalld:
+   - ipXtables: use -w or -w2 if supported (RHBZ#1161745, RHBZ#1151067)
+   - DROP INVALID packets (RHBZ#1169837)
+   - don't use ipv6header for protocol matching. (RHBZ#1065565)
+   - removeAllPassthroughs(): remove passthroughs in reverse order (RHBZ#1167100)
+   - fix config.service.removeDestination() (RHBZ#1164584)
+ - firewall-config:
+   - portProtoDialog: other protocol excludes port number/range
+   - better fix for updating zoneStore also in update_active_zones()
+   - fix typo in menu
+ - configuration:
+   - new services: tinc, vdsm, mosh, iscsi-target, rsyncd
+   - ship and install XML Schema files. (#8)
+ - man pages:
+   - firewalld.dbus, firewalld.direct, firewalld, firewall-cmd
+ - spec file:
+   - filesystem subpackage
+   - make dirs&files in /usr/lib/ world-readable (RHBZ#915988)
+ 
  * Tue Oct 14 2014 Jiri Popelka <jpopelka at redhat.com> - 0.3.12-1
  - firewalld:
    - new runtimeToPermanent and tracked passsthrough support