From 22f1377d80d4387c6349dce3dbe075feca8d32a3 Mon Sep 17 00:00:00 2001 From: Eric Garver Date: Wed, 6 Nov 2024 17:57:19 -0500 Subject: [PATCH] fix(service): update highest port number for ceph Resolves: RHEL-66205 --- ...ce-update-highest-port-number-for-ce.patch | 30 +++++++++++++++++++ firewalld.spec | 6 +++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0023-v2.2.0-fix-service-update-highest-port-number-for-ce.patch diff --git a/0023-v2.2.0-fix-service-update-highest-port-number-for-ce.patch b/0023-v2.2.0-fix-service-update-highest-port-number-for-ce.patch new file mode 100644 index 0000000..1fc48f8 --- /dev/null +++ b/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/firewalld.spec b/firewalld.spec index f211caf..cad656a 100644 --- a/firewalld.spec +++ b/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: 8%{?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,7 @@ 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 BuildArch: noarch BuildRequires: autoconf BuildRequires: automake @@ -250,6 +251,9 @@ rm -rf %{buildroot}%{_datadir}/firewalld/testsuite %{_mandir}/man1/firewall-config*.1* %changelog +* 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