From c7a87b146268679f0ace77ca6e00bd686253b852 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 4 Feb 2025 02:27:29 +0000 Subject: [PATCH] import UBI firewalld-1.3.4-9.el9_5 --- ...ce-update-highest-port-number-for-ce.patch | 30 +++++++++++ ...2.0-feat-service-x-rootd-file-server.patch | 52 +++++++++++++++++++ SPECS/firewalld.spec | 10 +++- 3 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 SOURCES/0023-v2.2.0-fix-service-update-highest-port-number-for-ce.patch create mode 100644 SOURCES/0024-v2.2.0-feat-service-x-rootd-file-server.patch diff --git a/SOURCES/0023-v2.2.0-fix-service-update-highest-port-number-for-ce.patch b/SOURCES/0023-v2.2.0-fix-service-update-highest-port-number-for-ce.patch new file mode 100644 index 0000000..1fc48f8 --- /dev/null +++ b/SOURCES/0023-v2.2.0-fix-service-update-highest-port-number-for-ce.patch @@ -0,0 +1,30 @@ +From 973d538bb74c10a812d4dcefe5ac6d546f7dedc9 Mon Sep 17 00:00:00 2001 +From: Pierre Riteau +Date: Mon, 22 Apr 2024 11:50:25 +0200 +Subject: [PATCH 23/24] v2.2.0: fix(service): update highest port number for + ceph + +The highest port number used by Ceph was updated in +https://github.com/ceph/ceph/pull/42210. + +Fixes https://github.com/firewalld/firewalld/issues/1329 + +(cherry picked from commit f514a3ea4b59a0be11467d1b68a992329b6dc8dd) +--- + config/services/ceph.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/services/ceph.xml b/config/services/ceph.xml +index efed53691afd..eb6a3f2d1e3d 100644 +--- a/config/services/ceph.xml ++++ b/config/services/ceph.xml +@@ -2,5 +2,5 @@ + + ceph + Ceph is a distributed object store and file system. Enable this option to support Ceph's Object Storage Daemons (OSD), Metadata Server Daemons (MDS), or Manager Daemons (MGR). +- ++ + +-- +2.43.5 + diff --git a/SOURCES/0024-v2.2.0-feat-service-x-rootd-file-server.patch b/SOURCES/0024-v2.2.0-feat-service-x-rootd-file-server.patch new file mode 100644 index 0000000..3e0614e --- /dev/null +++ b/SOURCES/0024-v2.2.0-feat-service-x-rootd-file-server.patch @@ -0,0 +1,52 @@ +From 8f42ac0312b5a90c0641a7dedd05e37cfa70b40a Mon Sep 17 00:00:00 2001 +From: Pat Riehecky +Date: Thu, 16 May 2024 13:17:15 -0500 +Subject: [PATCH 24/24] v2.2.0: feat(service): (x)rootd file server + +(cherry picked from commit 365fdcd0f73785cb8ce6a5e4ee225e6fd23dc003) +--- + config/Makefile.am | 1 + + config/services/rootd.xml | 6 ++++++ + po/POTFILES.in | 1 + + 3 files changed, 8 insertions(+) + create mode 100644 config/services/rootd.xml + +diff --git a/config/Makefile.am b/config/Makefile.am +index edae25fd9de0..711f05afb799 100644 +--- a/config/Makefile.am ++++ b/config/Makefile.am +@@ -280,6 +280,7 @@ CONFIG_FILES = \ + services/RH-Satellite-6.xml \ + services/RH-Satellite-6-capsule.xml \ + services/rpc-bind.xml \ ++ services/rootd.xml \ + services/rquotad.xml \ + services/rsh.xml \ + services/rsyncd.xml \ +diff --git a/config/services/rootd.xml b/config/services/rootd.xml +new file mode 100644 +index 000000000000..cf8e99ff8179 +--- /dev/null ++++ b/config/services/rootd.xml +@@ -0,0 +1,6 @@ ++ ++ ++ rootd ++ The (x)rootd server was developed for the root analysis framework to serve root files. However, the server is agnostic to file types and provides POSIX-like access to any type of file. ++ ++ +diff --git a/po/POTFILES.in b/po/POTFILES.in +index adeebdee3f55..a03ff0ce1df3 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -213,6 +213,7 @@ config/services/redis.xml + config/services/RH-Satellite-6.xml + config/services/RH-Satellite-6-capsule.xml + config/services/rpc-bind.xml ++config/services/rootd.xml + config/services/rquotad.xml + config/services/rsh.xml + config/services/rsyncd.xml +-- +2.43.5 + diff --git a/SPECS/firewalld.spec b/SPECS/firewalld.spec index f211caf..54d28aa 100644 --- a/SPECS/firewalld.spec +++ b/SPECS/firewalld.spec @@ -1,7 +1,7 @@ Summary: A firewall daemon with D-Bus interface providing a dynamic firewall Name: firewalld Version: 1.3.4 -Release: 7%{?dist} +Release: 9%{?dist} URL: http://www.firewalld.org License: GPLv2+ Source0: https://github.com/firewalld/firewalld/releases/download/v%{version}/firewalld-%{version}.tar.bz2 @@ -27,6 +27,8 @@ Patch19: 0019-v2.2.0-test-functions-start-firewalld-with-file-logg.patch Patch20: 0020-v2.2.0-feat-nftables-table-ownership.patch Patch21: 0021-v2.2.0-test-nftables-table-ownership.patch Patch22: 0022-v2.2.0-chore-service-remove-Conflicts-with-nftables.patch +Patch23: 0023-v2.2.0-fix-service-update-highest-port-number-for-ce.patch +Patch24: 0024-v2.2.0-feat-service-x-rootd-file-server.patch BuildArch: noarch BuildRequires: autoconf BuildRequires: automake @@ -250,6 +252,12 @@ rm -rf %{buildroot}%{_datadir}/firewalld/testsuite %{_mandir}/man1/firewall-config*.1* %changelog +* Wed Nov 06 2024 Eric Garver - 1.3.4-9 +- feat(service): (x)rootd file server + +* Wed Nov 06 2024 Eric Garver - 1.3.4-8 +- fix(service): update highest port number for ceph + * Mon Jul 01 2024 Eric Garver - 1.3.4-7 - feat(nftables): table ownership