diff --git a/0031-v2.2.0-fix-service-update-highest-port-number-for-ce.patch b/0031-v2.2.0-fix-service-update-highest-port-number-for-ce.patch new file mode 100644 index 0000000000000000000000000000000000000000..3f6394326ca773e87d253f0d01efe740c2c76925 --- /dev/null +++ b/0031-v2.2.0-fix-service-update-highest-port-number-for-ce.patch @@ -0,0 +1,29 @@ +From 4c95c843cd21f618677fe4d047b187facb00d027 Mon Sep 17 00:00:00 2001 +From: Pierre Riteau +Date: Mon, 22 Apr 2024 11:50:25 +0200 +Subject: [PATCH] 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.0 + diff --git a/firewalld.spec b/firewalld.spec index 1109c86c590d5cfa7e4c273c1578c8d9066cb258..e8a5146e77a57890e07f4dbb736298da7cdc038a 100644 --- a/firewalld.spec +++ b/firewalld.spec @@ -2,7 +2,7 @@ Summary: A firewall daemon with D-Bus interface providing a dynamic firewall Name: firewalld Version: 0.9.11 -Release: 9%{anolis_release}%{?dist} +Release: 10%{anolis_release}%{?dist} URL: http://www.firewalld.org License: GPLv2+ Source0: https://github.com/firewalld/firewalld/releases/download/v%{version}/firewalld-%{version}.tar.gz @@ -36,6 +36,7 @@ Patch27: 0027-v2.0.0-test-atlocal-pass-EBTABLES-to-testsuite.patch Patch28: 0028-v2.0.0-chore-direct-add-has_runtime_configuration.patch Patch29: 0029-v2.0.0-feat-direct-avoid-iptables-flush-if-using-nft.patch Patch30: 0030-v2.0.0-test-direct-avoid-iptables-flush-if-using-nft.patch +Patch31: 0031-v2.2.0-fix-service-update-highest-port-number-for-ce.patch # Add by Anolis Patch1000: 0001-firewalld-anolis-rebranding.patch @@ -241,9 +242,12 @@ desktop-file-install --delete-original \ %{_mandir}/man1/firewall-config*.1* %changelog -* Sun Sep 29 2024 Liwei Ge - 0.9.11-9.0.1 +* Wed Mar 19 2025 Liwei Ge - 0.9.11-10.0.1 - Remove Satellite service +* Tue Feb 04 2025 Eric Garver - 0.9.11-10 +- fix(service): update highest port number for ceph + * Fri Aug 02 2024 Eric Garver - 0.9.11-9 - feat(direct): avoid iptables flush if using nftables backend