update to 1.0.2

This commit is contained in:
eaglegai 2021-12-11 16:18:05 +08:00
parent 8e8c6985dc
commit 698cca5876
4 changed files with 35 additions and 9 deletions

View File

@ -17,23 +17,25 @@ diff --git a/config/zones/public.xml b/config/zones/public.xml
index 929ad72..a56e95c 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
--- 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

Binary file not shown.

BIN
firewalld-1.0.2.tar.gz Normal file

Binary file not shown.

View File

@ -1,10 +1,10 @@
Name: firewalld
Version: 0.9.4
Version: 1.0.2
Release: 1
Summary: A firewall daemon with D-Bus interface providing a dynamic firewall
License: GPLv2+
URL: http://www.firewalld.org
Source0: https://github.com/firewalld/firewalld/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source0: https://github.com/firewalld/firewalld/releases/download/v%{version}/%{name}-%{version}.tar.gz
#backport from gnome
Patch0: firewalld-0.2.6-MDNS-default.patch
Patch1: repair-test-cases.patch
@ -21,6 +21,7 @@ Suggests: iptables-nft
Obsoletes: firewalld-selinux < 0.4.4.2-2
Conflicts: selinux-policy < 3.14.1-28
Conflicts: cockpit-ws < 173-2
Recommends: polkit
Provides: variant_config(Server)
Provides: variant_config(Workstation)
@ -48,14 +49,18 @@ Summary: Python3 bindings for firewalld
%{?python_provide:%python_provide python3-firewall}
Obsoletes: python-firewall < 0.5.2-2
Obsoletes: python-firewall < 0.5.2-2
Obsoletes: python2-firewall < 0.5.2-2
Requires: python3-dbus python3-slip-dbus python3-decorator python3-gobject-base python3-nftables
Requires: python3-dbus python3-gobject-base python3-nftables
%description -n python3-firewall
Python3 bindings for firewalld.
%package -n firewalld-test
Summary: Firewalld testsuite
%description -n firewalld-test
This package provides the firewalld testsuite.
%prep
@ -65,7 +70,7 @@ Python3 bindings for firewalld.
%build
%configure --enable-sysconfig --enable-rpmmacros PYTHON=%{__python3}
%configure --enable-sysconfig --enable-rpmmacros PYTHON="%{__python3} %{py3_shbang_opts}"
%make_build
@ -144,6 +149,7 @@ fi
%{_bindir}/firewall-cmd
%{_bindir}/firewall-offline-cmd
%{_datadir}/bash-completion/completions/firewall-cmd
%dir %{_datadir}/zsh/site-functions
%{_datadir}/zsh/site-functions/_firewalld
%{_prefix}/lib/firewalld/*
%attr(0750,root,root) %dir %{_sysconfdir}/firewalld/
@ -152,6 +158,7 @@ fi
%attr(0750,root,root) %dir %{_sysconfdir}/firewalld/icmptypes
%attr(0750,root,root) %dir %{_sysconfdir}/firewalld/ipsets
%attr(0750,root,root) %dir %{_sysconfdir}/firewalld/services
%attr(0750,root,root) %dir %{_sysconfdir}/firewalld/policies
%attr(0750,root,root) %dir %{_sysconfdir}/firewalld/zones
%ghost %config(noreplace) %{_sysconfdir}/firewalld/firewalld.conf
%config(noreplace) %{_sysconfdir}/firewalld/lockdown-whitelist.xml
@ -163,7 +170,7 @@ fi
%{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.server.policy.choice
%ghost %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy
%{_sysconfdir}/modprobe.d/firewalld-sysctls.conf
%{_sysconfdir}/logrotate.d/firewalld
%config(noreplace) %{_sysconfdir}/logrotate.d/firewalld
%{_rpmconfigdir}/macros.d/macros.firewalld
#we don't need applet
@ -181,6 +188,7 @@ fi
%{_datadir}/metainfo/firewall-config.appdata.xml
%{_datadir}/icons/hicolor/*/apps/firewall-config*.*
%{_datadir}/glib-2.0/schemas/org.fedoraproject.FirewallConfig.gschema.xml
%exclude %{_datadir}/firewalld/testsuite/*
%files doc
%{_mandir}/man1/firewall*
@ -191,9 +199,25 @@ fi
%defattr(-,root,root)
%{python3_sitelib}/firewall/*
%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
%changelog
* Sat Dec 11 2021 gaihuiying <gaihuiying1@huawei.com> - 1.0.2-1
- Type:requirement
- ID:NA
- SUG:NA
- DESC:update to 1.0.2
* Thu Jul 22 2021 gaihuiying <gaihuiying1@huawei.com> - 0.9.4-1
- Type:requirement
- ID:NA