Accepting request 910605 from home:gmbr3:Active

- Update to 1.0.0:
  * Reduced dependencies
  * Intra-zone forwarding by default
  * NAT rules moved to inet family (reduced rule set)
  * Default target is now similar to reject
  * ICMP blocks and block inversion only apply to input,
    not forward
  * tftp-client service has been removed
  * iptables backend is deprecated
  * Direct interface is deprecated
  * CleanupModulesOnExit defaults to no
    (kernel modules not unloaded)
- Add new firewalld-test package
- Move bash and zsh completions to more useful separate packages
- Clean spec file
- Move modprobe.d and autostart files out of /etc

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

firewalld-0.9.3.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5998894db976d77996ca0a6b700a2f4125b9f283465fb255da9bddfb1640cb27
-size 1993006

firewalld-1.0.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c2ced8d2007d4a4aaf8a3f1ccc2e3a8c4089e60061f767a2992e867cfbe9ca0
+size 2037168

firewalld.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Sat Aug  7 14:27:01 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
+
+- Update to 1.0.0:
+  * Reduced dependencies
+  * Intra-zone forwarding by default
+  * NAT rules moved to inet family (reduced rule set)
+  * Default target is now similar to reject
+  * ICMP blocks and block inversion only apply to input,
+    not forward
+  * tftp-client service has been removed
+  * iptables backend is deprecated
+  * Direct interface is deprecated
+  * CleanupModulesOnExit defaults to no
+    (kernel modules not unloaded)
+- Add new firewalld-test package
+- Move bash and zsh completions to more useful separate packages
+- Clean spec file
+- Move modprobe.d and autostart files out of /etc
+
 -------------------------------------------------------------------
 Wed Apr  7 09:24:28 UTC 2021 - Michał Rostecki <mrostecki@suse.com>
 

firewalld.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package firewalld
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -21,12 +21,12 @@
   %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
 Name:           firewalld
-Version:        0.9.3
+Version:        1.0.0
 Release:        0
 Summary:        A firewall daemon with D-Bus interface providing a dynamic firewall
 License:        GPL-2.0-or-later
 Group:          Productivity/Networking/Security
-Url:            http://www.firewalld.org
+URL:            https://www.firewalld.org
 Source0:        https://github.com/firewalld/firewalld/releases/download/v%{version}/firewalld-%{version}.tar.gz
 Source1:        docker-zone.xml
 Patch0:         0002-Disable-FlushAllOnReload-option.patch
@@ -109,6 +109,33 @@ Requires:       python3-gobject-Gdk
 The firewall configuration application provides an configuration interface for
 firewalld.
 
+%package test
+Summary:        Firewalld testsuite
+Group:          Productivity/Networking/Security
+
+%description test
+This package provides the firewalld testsuite.
+
+%package bash-completion
+Summary:        Bash Completion for firewalld
+Group:          Productivity/Networking/Security
+Requires:       %{name} = %{version}-%{release}
+Requires:       bash-completion
+Supplements:    (%{name} and bash-completion)
+
+%description bash-completion
+Bash command line completion support for firewalld.
+
+%package zsh-completion
+Summary:        Zsh Completion for firewalld
+Group:          Productivity/Networking/Security
+Requires:       %{name} = %{version}-%{release}
+Requires:       zsh
+Supplements:    (%{name} and zsh)
+
+%description zsh-completion
+Zsh command line completion support for firewalld.
+
 %lang_package
 
 %prep
@@ -127,7 +154,7 @@ export PYTHON="%{_bindir}/python3"
 
 # Normally documentation is shipped but this will ensure that missing
 # files will be generated.
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install
@@ -155,6 +182,14 @@ ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rcfirewalld
 install -dp %{buildroot}%{_prefix}/lib/firewalld/zones
 install -p -m 644 %{SOURCE1} %{buildroot}%{_prefix}/lib/firewalld/zones/docker.xml
 
+# No more /etc
+mkdir -p %{buildroot}%{_prefix}/lib/modprobe.d
+mv %{buildroot}%{_sysconfdir}/modprobe.d/* %{buildroot}%{_prefix}/lib/modprobe.d
+%if %{defined _distconfdir}
+mkdir -p %{buildroot}%{_distconfdir}/xdg/autostart
+mv %{buildroot}%{_sysconfdir}/xdg/autostart/* %{buildroot}%{_distconfdir}/xdg/autostart
+%endif
+
 %fdupes %{buildroot}%{python3_sitelib}
 
 %find_lang %{name} --all-name
@@ -211,10 +246,6 @@ fi
 %{_sbindir}/rcfirewalld
 %{_bindir}/firewall-cmd
 %{_bindir}/firewall-offline-cmd
-%dir %{_datadir}/bash-completion/completions
-%{_datadir}/bash-completion/completions/firewall-cmd
-%dir %{_datadir}/zsh/site-functions
-%{_datadir}/zsh/site-functions/_firewalld
 %dir %{_prefix}/lib/firewalld
 %dir %{_prefix}/lib/firewalld/icmptypes
 %dir %{_prefix}/lib/firewalld/ipsets
@@ -231,8 +262,7 @@ fi
 %{_datadir}/polkit-1
 %dir %{_datadir}/dbus-1
 %dir %{_datadir}/dbus-1/system.d
-%dir %{_sysconfdir}/modprobe.d
+%{_prefix}/lib/modprobe.d/firewalld-sysctls.conf
-%config(noreplace) %{_sysconfdir}/modprobe.d/firewalld-sysctls.conf
 %config(noreplace) %{_sysconfdir}/firewalld/firewalld.conf
 %config(noreplace) %{_sysconfdir}/firewalld/lockdown-whitelist.xml
 %config(noreplace) %{_sysconfdir}/logrotate.d/firewalld
@@ -252,25 +282,20 @@ fi
 
 %files -n python3-firewall
 %attr(0755,root,root) %dir %{python3_sitelib}/firewall
-%attr(0755,root,root) %dir %{python3_sitelib}/firewall/__pycache__
 %attr(0755,root,root) %dir %{python3_sitelib}/firewall/config
-%attr(0755,root,root) %dir %{python3_sitelib}/firewall/config/__pycache__
 %attr(0755,root,root) %dir %{python3_sitelib}/firewall/core
-%attr(0755,root,root) %dir %{python3_sitelib}/firewall/core/__pycache__
 %attr(0755,root,root) %dir %{python3_sitelib}/firewall/core/io
-%attr(0755,root,root) %dir %{python3_sitelib}/firewall/core/io/__pycache__
 %attr(0755,root,root) %dir %{python3_sitelib}/firewall/server
-%attr(0755,root,root) %dir %{python3_sitelib}/firewall/server/__pycache__
+%attr(0755,root,root) %{python3_sitelib}/firewall/__pycache__
-%{python3_sitelib}/firewall/__pycache__/*.py*
+%attr(0755,root,root) %{python3_sitelib}/firewall/config/__pycache__
+%attr(0755,root,root) %{python3_sitelib}/firewall/core/__pycache__
+%attr(0755,root,root) %{python3_sitelib}/firewall/core/io/__pycache__
+%attr(0755,root,root) %{python3_sitelib}/firewall/server/__pycache__
 %{python3_sitelib}/firewall/*.py*
 %{python3_sitelib}/firewall/config/*.py*
-%{python3_sitelib}/firewall/config/__pycache__/*.py*
-%{python3_sitelib}/firewall/core/*.py*
-%{python3_sitelib}/firewall/core/__pycache__/*.py*
-%{python3_sitelib}/firewall/core/io/*.py*
-%{python3_sitelib}/firewall/core/io/__pycache__/*.py*
 %{python3_sitelib}/firewall/server/*.py*
-%{python3_sitelib}/firewall/server/__pycache__/*.py*
+%{python3_sitelib}/firewall/core/io/*.py*
+%{python3_sitelib}/firewall/core/*.py*
 
 %files -n firewall-macros
 %{_rpmmacrodir}/macros.firewalld
@@ -279,7 +304,11 @@ fi
 %attr(0755,root,root) %{_bindir}/firewall-applet
 %dir %{_sysconfdir}/firewall
 %config(noreplace) %{_sysconfdir}/firewall/applet.conf
+%if %{undefined _distconfdir}
 %{_sysconfdir}/xdg/autostart/firewall-applet.desktop
+%else
+%{_distconfdir}/xdg/autostart/firewall-applet.desktop
+%endif
 %{_datadir}/icons/hicolor/*/apps/firewall-applet*.*
 %{_mandir}/man1/firewall-applet*.1%{?ext_man}
 
@@ -290,12 +319,29 @@ fi
 %attr(0755,root,root) %{_datadir}/firewalld/gtk3_chooserbutton.py*
 %attr(0755,root,root) %{_datadir}/firewalld/gtk3_niceexpander.py*
 %{_datadir}/applications/firewall-config.desktop
-%dir %{_datadir}/metainfo
 %{_datadir}/metainfo/firewall-config.appdata.xml
 %{_datadir}/icons/hicolor/*/apps/firewall-config*.*
 %{_datadir}/glib-2.0/schemas/org.fedoraproject.FirewallConfig.gschema.xml
 %{_mandir}/man1/firewall-config*.1%{?ext_man}
 
+%files 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
+%attr(0755,root,root) %{_datadir}/firewalld/testsuite/python/*.py
+%attr(0755,root,root) %{_datadir}/firewalld/testsuite/python/__pycache__
+
+%files bash-completion
+%dir %{_datadir}/bash-completion/completions
+%{_datadir}/bash-completion/completions/firewall-cmd
+
+%files zsh-completion
+%dir %{_datadir}/zsh/site-functions
+%{_datadir}/zsh/site-functions/_firewalld
+
 %files lang -f %{name}.lang
 
 %changelog