import firewalld-1.0.0-2.el9
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
commit
2ae5845efb
1
.firewalld.metadata
Normal file
1
.firewalld.metadata
Normal file
@ -0,0 +1 @@
|
||||
8ae534ae5675079eb893406ec88b52ee7f88cb6b SOURCES/firewalld-1.0.0.tar.gz
|
||||
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
SOURCES/firewalld-1.0.0.tar.gz
|
||||
@ -0,0 +1,99 @@
|
||||
From 174b42b2943200a7b2ec2dab6c3445158aa04aba Mon Sep 17 00:00:00 2001
|
||||
From: Eric Garver <egarver@redhat.com>
|
||||
Date: Tue, 25 May 2021 13:31:41 -0400
|
||||
Subject: [PATCH] RHEL only: Add cockpit by default to some zones
|
||||
|
||||
Fixes: #1581578
|
||||
---
|
||||
config/zones/home.xml | 1 +
|
||||
config/zones/internal.xml | 1 +
|
||||
config/zones/public.xml | 1 +
|
||||
config/zones/work.xml | 1 +
|
||||
src/tests/functions.at | 20 ++++++++++++++++++++
|
||||
5 files changed, 24 insertions(+)
|
||||
|
||||
diff --git a/config/zones/home.xml b/config/zones/home.xml
|
||||
index d73c9bdb16b6..33064688367e 100644
|
||||
--- a/config/zones/home.xml
|
||||
+++ b/config/zones/home.xml
|
||||
@@ -6,5 +6,6 @@
|
||||
<service name="mdns"/>
|
||||
<service name="samba-client"/>
|
||||
<service name="dhcpv6-client"/>
|
||||
+ <service name="cockpit"/>
|
||||
<forward/>
|
||||
</zone>
|
||||
diff --git a/config/zones/internal.xml b/config/zones/internal.xml
|
||||
index 053c18ccda8b..852b16ad94dd 100644
|
||||
--- a/config/zones/internal.xml
|
||||
+++ b/config/zones/internal.xml
|
||||
@@ -6,5 +6,6 @@
|
||||
<service name="mdns"/>
|
||||
<service name="samba-client"/>
|
||||
<service name="dhcpv6-client"/>
|
||||
+ <service name="cockpit"/>
|
||||
<forward/>
|
||||
</zone>
|
||||
diff --git a/config/zones/public.xml b/config/zones/public.xml
|
||||
index 49fc4c20af52..62bc751de448 100644
|
||||
--- a/config/zones/public.xml
|
||||
+++ b/config/zones/public.xml
|
||||
@@ -4,5 +4,6 @@
|
||||
<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="dhcpv6-client"/>
|
||||
+ <service name="cockpit"/>
|
||||
<forward/>
|
||||
</zone>
|
||||
diff --git a/config/zones/work.xml b/config/zones/work.xml
|
||||
index f1a14a9b4682..27b54a7783c4 100644
|
||||
--- a/config/zones/work.xml
|
||||
+++ b/config/zones/work.xml
|
||||
@@ -4,5 +4,6 @@
|
||||
<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="dhcpv6-client"/>
|
||||
+ <service name="cockpit"/>
|
||||
<forward/>
|
||||
</zone>
|
||||
diff --git a/src/tests/functions.at b/src/tests/functions.at
|
||||
index 3f343ef49de1..c950a3c7a1a6 100644
|
||||
--- a/src/tests/functions.at
|
||||
+++ b/src/tests/functions.at
|
||||
@@ -106,6 +106,14 @@ m4_define([FWD_START_TEST], [
|
||||
fi
|
||||
|
||||
m4_ifdef([TESTING_FIREWALL_OFFLINE_CMD], [
|
||||
+ AT_KEYWORDS(offline)
|
||||
+ dnl cockpit is added by default downstream, but upstream tests don't expect
|
||||
+ dnl it. Simply remove it at the start of every test.
|
||||
+ dnl
|
||||
+ FWD_OFFLINE_CHECK([--zone home --remove-service-from-zone cockpit], 0, [ignore])
|
||||
+ FWD_OFFLINE_CHECK([--zone internal --remove-service-from-zone cockpit], 0, [ignore])
|
||||
+ FWD_OFFLINE_CHECK([--zone public --remove-service-from-zone cockpit], 0, [ignore])
|
||||
+ FWD_OFFLINE_CHECK([--zone work --remove-service-from-zone cockpit], 0, [ignore])
|
||||
], [
|
||||
dnl set the appropriate backend
|
||||
AT_CHECK([sed -i 's/^FirewallBackend.*/FirewallBackend=FIREWALL_BACKEND/' ./firewalld.conf])
|
||||
@@ -237,6 +245,18 @@ m4_define([FWD_START_TEST], [
|
||||
])
|
||||
|
||||
FWD_START_FIREWALLD
|
||||
+
|
||||
+ dnl cockpit is added by default downstream, but upstream tests don't expect
|
||||
+ dnl it. Simply remove it at the start of every test.
|
||||
+ dnl
|
||||
+ FWD_CHECK([--permanent --zone home --remove-service cockpit], 0, [ignore])
|
||||
+ FWD_CHECK([ --zone home --remove-service cockpit], 0, [ignore])
|
||||
+ FWD_CHECK([--permanent --zone internal --remove-service cockpit], 0, [ignore])
|
||||
+ FWD_CHECK([ --zone internal --remove-service cockpit], 0, [ignore])
|
||||
+ FWD_CHECK([--permanent --zone public --remove-service cockpit], 0, [ignore])
|
||||
+ FWD_CHECK([ --zone public --remove-service cockpit], 0, [ignore])
|
||||
+ FWD_CHECK([--permanent --zone work --remove-service cockpit], 0, [ignore])
|
||||
+ FWD_CHECK([ --zone work --remove-service cockpit], 0, [ignore])
|
||||
])
|
||||
])
|
||||
|
||||
--
|
||||
2.27.0
|
||||
|
||||
245
SPECS/firewalld.spec
Normal file
245
SPECS/firewalld.spec
Normal file
@ -0,0 +1,245 @@
|
||||
Summary: A firewall daemon with D-Bus interface providing a dynamic firewall
|
||||
Name: firewalld
|
||||
Version: 1.0.0
|
||||
Release: 2%{?dist}
|
||||
URL: http://www.firewalld.org
|
||||
License: GPLv2+
|
||||
Source0: https://github.com/firewalld/firewalld/releases/download/v%{version}/firewalld-%{version}.tar.gz
|
||||
Patch1: 0001-RHEL-only-Add-cockpit-by-default-to-some-zones.patch
|
||||
BuildArch: noarch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: gettext
|
||||
BuildRequires: intltool
|
||||
# glib2-devel is needed for gsettings.m4
|
||||
BuildRequires: glib2, glib2-devel
|
||||
BuildRequires: systemd-units
|
||||
BuildRequires: docbook-style-xsl
|
||||
BuildRequires: libxslt
|
||||
BuildRequires: iptables, ebtables, ipset
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: make
|
||||
Requires: iptables, ebtables, ipset
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
Requires: firewalld-filesystem = %{version}-%{release}
|
||||
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
|
||||
|
||||
%description
|
||||
firewalld is a firewall service daemon that provides a dynamic customizable
|
||||
firewall with a D-Bus interface.
|
||||
|
||||
%package -n python3-firewall
|
||||
Summary: Python3 bindings for firewalld
|
||||
|
||||
%{?python_provide:%python_provide python3-firewall}
|
||||
|
||||
Requires: python3-dbus
|
||||
Requires: python3-gobject-base
|
||||
Requires: python3-nftables
|
||||
|
||||
%description -n python3-firewall
|
||||
Python3 bindings for firewalld.
|
||||
|
||||
%package -n firewalld-filesystem
|
||||
Summary: Firewalld directory layout and rpm macros
|
||||
|
||||
%description -n firewalld-filesystem
|
||||
This package provides directories and rpm macros which
|
||||
are required by other packages that add firewalld configuration files.
|
||||
|
||||
%package -n firewall-applet
|
||||
Summary: Firewall panel applet
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: firewall-config = %{version}-%{release}
|
||||
Requires: hicolor-icon-theme
|
||||
Requires: python3-qt5-base
|
||||
Requires: python3-gobject
|
||||
Requires: libnotify
|
||||
Requires: NetworkManager-libnm
|
||||
Requires: dbus-x11
|
||||
|
||||
%description -n firewall-applet
|
||||
The firewall panel applet provides a status information of firewalld and also
|
||||
the firewall settings.
|
||||
|
||||
%package -n firewall-config
|
||||
Summary: Firewall configuration application
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: hicolor-icon-theme
|
||||
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
|
||||
firewalld.
|
||||
|
||||
%pretrans -p <lua>
|
||||
-- HACK: Old rpm versions had an untracked (%ghost) symlink for
|
||||
-- /etc/firewalld/firewalld.conf. RPM won't handle replacing the symlink due to
|
||||
-- "%config(noreplace)". As such, we remove the symlink here before attempting
|
||||
-- to install the new version which is a real file. Only replace the symlink if
|
||||
-- the target matches one of the previous package's expected targets.
|
||||
--
|
||||
-- Unfortunately this must be done in pretrans in order to occur before RPM
|
||||
-- makes decisions about file replacement.
|
||||
--
|
||||
local old_package_symlinks = {"firewalld-standard.conf", "firewalld-server.conf",
|
||||
"firewalld-workstation.conf"}
|
||||
|
||||
local symlink_target = posix.readlink("%{_sysconfdir}/firewalld/firewalld.conf")
|
||||
for k,v in ipairs(old_package_symlinks) do
|
||||
if symlink_target == v then
|
||||
posix.unlink("%{_sysconfdir}/firewalld/firewalld.conf")
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
%configure --enable-sysconfig --enable-rpmmacros PYTHON="%{__python3} %{py3_shbang_opts}"
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
make install DESTDIR=%{buildroot}
|
||||
desktop-file-install --delete-original \
|
||||
--dir %{buildroot}%{_sysconfdir}/xdg/autostart \
|
||||
%{buildroot}%{_sysconfdir}/xdg/autostart/firewall-applet.desktop
|
||||
desktop-file-install --delete-original \
|
||||
--dir %{buildroot}%{_datadir}/applications \
|
||||
%{buildroot}%{_datadir}/applications/firewall-config.desktop
|
||||
|
||||
install -d -m 755 %{buildroot}%{_prefix}/lib/firewalld/zones/
|
||||
|
||||
# remove unhandle firewalld-test subpackage
|
||||
rm -rf %{buildroot}%{_datadir}/firewalld/testsuite
|
||||
|
||||
%find_lang %{name} --all-name
|
||||
|
||||
%post
|
||||
%systemd_post firewalld.service
|
||||
|
||||
%preun
|
||||
%systemd_preun firewalld.service
|
||||
|
||||
%postun
|
||||
%systemd_postun_with_restart firewalld.service
|
||||
|
||||
%files -f %{name}.lang
|
||||
%doc COPYING README
|
||||
%{_sbindir}/firewalld
|
||||
%{_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
|
||||
%{_prefix}/lib/firewalld/icmptypes/*.xml
|
||||
%{_prefix}/lib/firewalld/ipsets/README
|
||||
%{_prefix}/lib/firewalld/policies/*.xml
|
||||
%{_prefix}/lib/firewalld/services/*.xml
|
||||
%{_prefix}/lib/firewalld/zones/*.xml
|
||||
%{_prefix}/lib/firewalld/helpers/*.xml
|
||||
%attr(0750,root,root) %dir %{_sysconfdir}/firewalld
|
||||
%config(noreplace) %{_sysconfdir}/firewalld/firewalld.conf
|
||||
%config(noreplace) %{_sysconfdir}/firewalld/lockdown-whitelist.xml
|
||||
%attr(0750,root,root) %dir %{_sysconfdir}/firewalld/helpers
|
||||
%attr(0750,root,root) %dir %{_sysconfdir}/firewalld/icmptypes
|
||||
%attr(0750,root,root) %dir %{_sysconfdir}/firewalld/ipsets
|
||||
%attr(0750,root,root) %dir %{_sysconfdir}/firewalld/policies
|
||||
%attr(0750,root,root) %dir %{_sysconfdir}/firewalld/services
|
||||
%attr(0750,root,root) %dir %{_sysconfdir}/firewalld/zones
|
||||
%defattr(0644,root,root)
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/firewalld
|
||||
%{_unitdir}/firewalld.service
|
||||
%config(noreplace) %{_datadir}/dbus-1/system.d/FirewallD.conf
|
||||
%{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.desktop.policy.choice
|
||||
%{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.server.policy.choice
|
||||
%{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy
|
||||
%{_mandir}/man1/firewall*cmd*.1*
|
||||
%{_mandir}/man1/firewalld*.1*
|
||||
%{_mandir}/man5/firewall*.5*
|
||||
%{_sysconfdir}/modprobe.d/firewalld-sysctls.conf
|
||||
%{_sysconfdir}/logrotate.d/firewalld
|
||||
|
||||
%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__
|
||||
%{python3_sitelib}/firewall/__pycache__/*.py*
|
||||
%{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*
|
||||
|
||||
%files -n firewalld-filesystem
|
||||
%dir %{_prefix}/lib/firewalld
|
||||
%dir %{_prefix}/lib/firewalld/helpers
|
||||
%dir %{_prefix}/lib/firewalld/icmptypes
|
||||
%dir %{_prefix}/lib/firewalld/ipsets
|
||||
%dir %{_prefix}/lib/firewalld/policies
|
||||
%dir %{_prefix}/lib/firewalld/services
|
||||
%dir %{_prefix}/lib/firewalld/zones
|
||||
%{_rpmconfigdir}/macros.d/macros.firewalld
|
||||
|
||||
%files -n firewall-applet
|
||||
%{_bindir}/firewall-applet
|
||||
%defattr(0644,root,root)
|
||||
%{_sysconfdir}/xdg/autostart/firewall-applet.desktop
|
||||
%dir %{_sysconfdir}/firewall
|
||||
%{_sysconfdir}/firewall/applet.conf
|
||||
%{_datadir}/icons/hicolor/*/apps/firewall-applet*.*
|
||||
%{_mandir}/man1/firewall-applet*.1*
|
||||
|
||||
%files -n firewall-config
|
||||
%{_bindir}/firewall-config
|
||||
%defattr(0644,root,root)
|
||||
%{_datadir}/firewalld/firewall-config.glade
|
||||
%{_datadir}/firewalld/gtk3_chooserbutton.py*
|
||||
%{_datadir}/firewalld/gtk3_niceexpander.py*
|
||||
%{_datadir}/applications/firewall-config.desktop
|
||||
%{_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*
|
||||
|
||||
%changelog
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.0-2
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Mon Jul 26 2021 Eric Garver <egarver@redhat.com> - 1.0.0-1
|
||||
- package rebase to v1.0.0
|
||||
|
||||
* Mon Jun 07 2021 Eric Garver <egarver@redhat.com> - 1.0.0-0.3.alpha
|
||||
- remove dead symlink (firewalld.conf) left over from old package versions
|
||||
before installing new file
|
||||
|
||||
* Tue Jun 01 2021 Eric Garver <egarver@redhat.com> - 1.0.0-0.2.alpha
|
||||
- fix missing policy kit symlink
|
||||
|
||||
* Tue May 25 2021 Eric Garver <egarver@redhat.com> - 1.0.0-0.1.alpha
|
||||
- package rebase to v1.0.0-alpha
|
||||
Loading…
Reference in New Issue
Block a user