Accepting request 404198 from home:markoschandras:network

- Update to version 0.4.3
  * New firewallctl utility (RHBZ#1147959)
  * doc.xml.seealso: Show firewalld.dbus in See Also sections
  * firewall.core.fw_config: Create backup on zone, service, ipset and icmptype removal (RHBZ#1339251)
  * {zone,service,ipset,icmptype}_writer: Do not fail on failed backup
  * firewall-[offline-]cmd: Fix --new-X-from-file options for files in cwd
  * firewall-cmd: Dropped duplicate setType call in --new-ipset
  * radius service: Support also tcp ports (RBZ#1219717)
  * xmlschemas: Support source-port, protocol, icmp-block-inversion and ipset sources
  * config.xmlschema.service.xsd: Fix service destination conflicts (RHBZ#1296573)
  * firewall-cmd, firewalld man: Information about new NetworkManager and ifcfg
  * firewall.command: Only print summary and description in print_X_info with verbose
  * firewall.command: print_msg should be able to print empty lines
  * firewall-config: No processing of runtime passthroughs signals in permanent
  * Landspace.io fixes and pylint calm downs
  * firewall.core.io.zone: Add zone_reader and zone_writer to all, pylint fixes
  * firewall-config: Fixed titles of command and context dialogs, also entry lenths
  * firewall-config: pylint calm downs
  * firewall.core.fw_zone: Fix use of MAC source in rich rules without ipv limit
  * firewall-config: Use self.active_zoens in conf_zone_added_cb
  * firewall.command: New parse_port, extended parse methods with more checks
  * firewall.command: Fixed parse_port to use the separator in the split call
  * firewall.command: New [de]activate_exception_handler, raise error in parse_X
  * services ha: Allow corosync-qnetd port
  * firewall-applet: Support for kde5-nm-connection-editor
  * tests/firewall-offline-cmd_test.sh: New tests for service and icmptype modifications
  * firewall-offline-cmd: Use FirewallCommand for simplification and sequence options
  * tests/firewall-cmd_test.sh: New tests for service and icmptype modifications
  * firewall-cmd: Fixed set, remove and query destination options for services
  * firewall.core.io.service: Source ports have not been checked in _check_config

OBS-URL: https://build.opensuse.org/request/show/404198
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/firewalld?expand=0&rev=21

firewalld.spec

@@ -17,22 +17,13 @@
 
 
 Name:           firewalld
-Version:        0.4.2
+Version:        0.4.3
 Release:        0
 Summary:        A firewall daemon with D-Bus interface providing a dynamic firewall
 License:        GPL-2.0+
 Group:          Productivity/Networking/Security
 Url:            http://www.firewalld.org
 Source:         https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM: 0001-src-firewall-core-Drop-unneeded-python-shebangs.patch
-# Drop python shebangs
-Patch0:         0001-src-firewall-core-Drop-unneeded-python-shebangs.patch
-# PATCH-FIX-UPSTREAM: 0002-firewall-core-fw_ifcfg-Quickly-return-if-ifcfg-direc.patch
-# Do not access the ifcfg directory if it does not exist
-Patch1:         0002-firewall-core-fw_ifcfg-Quickly-return-if-ifcfg-direc.patch
-# PATCH-FIX-UPSTREAM: 0003-firewall.core.fw_nm-Hide-NM-typelib-import-new-nm_ge.patch
-# Hide unneeded NM dependencies
-Patch2:         0003-firewall.core.fw_nm-Hide-NM-typelib-import-new-nm_ge.patch
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  gettext
@@ -42,6 +33,7 @@ BuildRequires:  hicolor-icon-theme
 BuildRequires:  intltool
 BuildRequires:  libxslt-tools
 BuildRequires:  python-devel
+BuildRequires:  systemd-rpm-macros
 # Adding tools to BuildRequires as well so they can be autodetected
 # even though it is probably unlikely for paths to change in the future
 BuildRequires:  ebtables
@@ -59,7 +51,6 @@ Requires(post): %fillup_prereq
 Recommends:     %{name}-lang
 Suggests:       susefirewall2-to-firewalld
 BuildArch:      noarch
-BuildRequires:  systemd-rpm-macros
 
 %description
 firewalld is a firewall service daemon that provides a dynamic customizable
@@ -93,15 +84,16 @@ firewalld.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %configure --enable-sysconfig --enable-rpmmacros
 
+# Normally documentation is shipped but this will ensure that missing
+# files will be generated.
+make %{?_smp_mflags}
+
 %install
-make DESTDIR=%{buildroot} install
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
 
 %py_compile %{buildroot}
 
@@ -123,6 +115,9 @@ ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rcfirewalld
 rm %{buildroot}%{_rpmconfigdir}/macros.d/macros.firewalld
 install -D -m644 config/macros.firewalld %{buildroot}%{_sysconfdir}/rpm/macros.firewalld
 
+# Temporary fix for gh#t-woerner/firewalld#127
+cp doc/man/man1/firewallctl.1 %{buildroot}%{_mandir}/man1/
+
 %find_lang %{name} --all-name
 
 %pre
@@ -178,6 +173,7 @@ fi
 %{_sbindir}/rcfirewalld
 %{_bindir}/firewall-cmd
 %{_bindir}/firewall-offline-cmd
+%{_bindir}/firewallctl
 %dir %{_datadir}/bash-completion/completions
 %{_datadir}/bash-completion/completions/firewall-cmd
 %{_libexecdir}/firewalld/xmlschema/*.xsd
@@ -219,6 +215,7 @@ fi
 %{python_sitelib}/firewall/server/*.py*
 %{_mandir}/man1/firewall*cmd*.1*
 %{_mandir}/man1/firewalld*.1*
+%{_mandir}/man1/firewallctl*.1*
 %{_mandir}/man5/firewall*.5*
 
 %files -n firewall-applet
@@ -231,6 +228,7 @@ fi
 %{_mandir}/man1/firewall-applet*.1*
 
 %files -n firewall-config
+%defattr(-,root,root)
 %dir %{_datadir}/firewalld
 %defattr(0644,root,root)
 %attr(0755,root,root) %{_bindir}/firewall-config
@@ -245,5 +243,6 @@ fi
 %{_mandir}/man1/firewall-config*.1*
 
 %files lang -f %{name}.lang
+%defattr(-,root,root)
 
 %changelog