rebase to v1.0.0

.gitignore

@@ -64,3 +64,4 @@
 /firewalld-0.9.1.tar.gz
 /firewalld-0.9.2.tar.gz
 /firewalld-0.9.3.tar.gz
+/firewalld-1.0.0.tar.gz

fedora-only-MDNS-default.patch

@@ -1,4 +1,4 @@
-From 0e9306e9df41142503b4efc90032043183a3cb7b Mon Sep 17 00:00:00 2001
+From f8d7af68530d8a9aa0c972911d489fcd72a5ef74 Mon Sep 17 00:00:00 2001
 From: Stef Walter <stefw@gnome.org>
 Date: Mon, 6 Aug 2012 10:01:09 +0200
 Subject: [PATCH] Make MDNS work in all but the most restrictive zones
@@ -14,27 +14,29 @@ Subject: [PATCH] Make MDNS work in all but the most restrictive zones
  2 files changed, 2 insertions(+)
 
 diff --git a/config/zones/public.xml b/config/zones/public.xml
-index 929ad72..a56e95c 100644
+index 49fc4c20af52..95433962c259 100644
 --- a/config/zones/public.xml
 +++ b/config/zones/public.xml
-@@ -3,5 +3,6 @@
+@@ -3,6 +3,7 @@
    <short>Public</short>
    <description>For use in public areas. You do not trust the other computers on networks to not harm your computer. Only selected incoming connections are accepted.</description>
    <service name="ssh"/>
 +  <service name="mdns"/>
    <service name="dhcpv6-client"/>
+   <forward/>
  </zone>
 diff --git a/config/zones/work.xml b/config/zones/work.xml
-index 7e750fc..77f13c8 100644
+index f1a14a9b4682..eaf509023137 100644
 --- a/config/zones/work.xml
 +++ b/config/zones/work.xml
-@@ -3,5 +3,6 @@
+@@ -3,6 +3,7 @@
    <short>Work</short>
    <description>For use in work areas. You mostly trust the other computers on networks to not harm your computer. Only selected incoming connections are accepted.</description>
    <service name="ssh"/>
 +  <service name="mdns"/>
    <service name="dhcpv6-client"/>
+   <forward/>
  </zone>
 -- 
-1.7.11.2
+2.31.1
 

firewalld.spec

@@ -1,14 +1,14 @@
 Summary: A firewall daemon with D-Bus interface providing a dynamic firewall
 Name: firewalld
-Version: 0.9.3
+Version: 1.0.0
-Release: 7%{?dist}
+Release: 1%{?dist}
 URL:     http://www.firewalld.org
 License: GPLv2+
 Source0: https://github.com/firewalld/firewalld/releases/download/v%{version}/firewalld-%{version}.tar.gz
 Source1: FedoraServer.xml
 Source2: FedoraWorkstation.xml
 Source3: org.fedoraproject.FirewallD1.desktop.rules.choice
-Patch0: firewalld-0.2.6-MDNS-default.patch
+Patch0: fedora-only-MDNS-default.patch
 BuildArch: noarch
 BuildRequires: autoconf
 BuildRequires: automake
@@ -33,6 +33,7 @@ Requires: python3-firewall  = %{version}-%{release}
 Obsoletes: firewalld-selinux < 0.4.4.2-2
 Conflicts: selinux-policy < 3.14.1-28
 Conflicts: cockpit-ws < 173-2
+Recommends: libcap-ng-python3
 
 Provides: variant_config(Server)
 Provides: variant_config(Workstation)
@@ -56,8 +57,6 @@ Summary: Python3 bindings for firewalld
 Obsoletes: python-firewall < 0.5.2-2
 Obsoletes: python2-firewall < 0.5.2-2
 Requires: python3-dbus
-Requires: python3-slip-dbus
-Requires: python3-decorator
 Requires: python3-gobject-base
 Requires: python3-nftables
 
@@ -71,6 +70,12 @@ Summary: Firewalld directory layout and rpm macros
 This package provides directories and rpm macros which
 are required by other packages that add firewalld configuration files.
 
+%package -n firewalld-test
+Summary: Firewalld testsuite
+
+%description -n firewalld-test
+This package provides the firewalld testsuite.
+
 %package -n firewall-applet
 Summary: Firewall panel applet
 Requires: %{name} = %{version}-%{release}
@@ -94,6 +99,7 @@ Requires: gtk3
 Requires: python3-gobject
 Requires: NetworkManager-libnm
 Requires: dbus-x11
+Recommends: polkit
 
 %description -n firewall-config
 The firewall configuration application provides an configuration interface for 
@@ -264,6 +270,18 @@ fi
 %dir %{_prefix}/lib/firewalld/zones
 %{_rpmconfigdir}/macros.d/macros.firewalld
 
+%files -n firewalld-test
+%dir %{_datadir}/firewalld/testsuite
+%{_datadir}/firewalld/testsuite/README
+%{_datadir}/firewalld/testsuite/testsuite
+%dir %{_datadir}/firewalld/testsuite/integration
+%{_datadir}/firewalld/testsuite/integration/testsuite
+%dir %{_datadir}/firewalld/testsuite/python
+%{_datadir}/firewalld/testsuite/python/firewalld_config.py
+%{_datadir}/firewalld/testsuite/python/firewalld_direct.py
+%{_datadir}/firewalld/testsuite/python/firewalld_rich.py
+%{_datadir}/firewalld/testsuite/python/firewalld_test.py
+
 %files -n firewall-applet
 %{_bindir}/firewall-applet
 %defattr(0644,root,root)
@@ -286,6 +304,12 @@ fi
 %{_mandir}/man1/firewall-config*.1*
 
 %changelog
+* Fri Jul 23 2021 Eric Garver <eric@garver.life> - 1.0.0-1
+- rebase package to v1.0.0
+- add subpackage firewalld-test
+- remove Requires: python3-decorator, python3-slip-dbus
+- add Recommends: polkit, libcap-ng-python3
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (firewalld-0.9.3.tar.gz) = 9be24a2186179a347cb4c29137423e4a4dcf5faf8fad28bc5258383d6415b1c5fad049dcb20312f6c80181a6a3cf72ecb9b6bcaee1b2a82399674aedc9d568bb
+SHA512 (firewalld-1.0.0.tar.gz) = 4c541453fde3012b9a2cc885f6dcf3dc3ca7c5c6292f365f8b75c262fa7a1bb81a280392c5d7dc0c5ff1a4141ff47d63e9a766784c59f03f918d3e45500fc3c4