From d34619f2aa3bd3f7e78e6f2efac32bd9646ed1f6 Mon Sep 17 00:00:00 2001 From: baiguo Date: Mon, 29 Apr 2024 20:25:56 +0800 Subject: [PATCH 1/2] update highest port number for ceph (cherry picked from commit 2848e6e029a232cb409db64a1a399f7c7cd46bf0) --- ...-update-highest-port-number-for-ceph.patch | 23 +++++++++++++++++++ firewalld.spec | 9 +++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 0002-fix-service-update-highest-port-number-for-ceph.patch diff --git a/0002-fix-service-update-highest-port-number-for-ceph.patch b/0002-fix-service-update-highest-port-number-for-ceph.patch new file mode 100644 index 0000000..13e74b8 --- /dev/null +++ b/0002-fix-service-update-highest-port-number-for-ceph.patch @@ -0,0 +1,23 @@ +From fea78fc8f4ff373bcc9eb85c7f99d1a9b45f44af Mon Sep 17 00:00:00 2001 +From: Pierre pierre@stackhpc.com +Date: Mon, 29 Apr 2024 20:11:55 +0800 +Subject: [PATCH] fix(service): update highest port number for ceph + +--- + 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 efed536..eb6a3f2 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.27.0 + diff --git a/firewalld.spec b/firewalld.spec index 4e620ac..5525fd8 100644 --- a/firewalld.spec +++ b/firewalld.spec @@ -1,6 +1,6 @@ Name: firewalld Version: 1.2.6 -Release: 2 +Release: 3 Summary: A firewall daemon with D-Bus interface providing a dynamic firewall License: GPLv2+ URL: http://www.firewalld.org @@ -12,6 +12,7 @@ Patch2: add-Restart-on-failure-on-firewalld.service.patch Patch3: 0001-fix-config-Specify-the-translation-encoding-format-a.patch Patch4: backport-chore-nftables-add-delete-table-helper.patch Patch5: backport-fix-nftables-always-flush-main-table-on-start.patch +Patch6: 0002-fix-service-update-highest-port-number-for-ceph.patch BuildArch: noarch BuildRequires: autoconf automake desktop-file-utils gettext intltool glib2 glib2-devel systemd-units docbook-style-xsl @@ -233,6 +234,12 @@ fi %{_datadir}/firewalld/testsuite/python/firewalld_test.py %changelog +* Thu Apr 29 2024 baiguo - 1.2.6-3 +- Type:requirement +- ID:NA +- SUG:NA +- DESC:update highest port number for ceph + * Sun Apr 28 2024 zhouyihang - 1.2.6-2 - Type:bugfix - ID:NA -- Gitee From a9b54444d9a7bd0e10dc1a2e6779671b31752033 Mon Sep 17 00:00:00 2001 From: baiguo Date: Thu, 9 May 2024 14:04:03 +0800 Subject: [PATCH 2/2] backport fix service update highest port number for ceph (cherry picked from commit 4300a1b2981d7f7f697920ef6406ce9c41e5e03a) --- ...port-fix-service-update-highest-port-number-for-ceph.patch | 0 firewalld.spec | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename 0002-fix-service-update-highest-port-number-for-ceph.patch => backport-fix-service-update-highest-port-number-for-ceph.patch (100%) diff --git a/0002-fix-service-update-highest-port-number-for-ceph.patch b/backport-fix-service-update-highest-port-number-for-ceph.patch similarity index 100% rename from 0002-fix-service-update-highest-port-number-for-ceph.patch rename to backport-fix-service-update-highest-port-number-for-ceph.patch diff --git a/firewalld.spec b/firewalld.spec index 5525fd8..cf372db 100644 --- a/firewalld.spec +++ b/firewalld.spec @@ -12,7 +12,7 @@ Patch2: add-Restart-on-failure-on-firewalld.service.patch Patch3: 0001-fix-config-Specify-the-translation-encoding-format-a.patch Patch4: backport-chore-nftables-add-delete-table-helper.patch Patch5: backport-fix-nftables-always-flush-main-table-on-start.patch -Patch6: 0002-fix-service-update-highest-port-number-for-ceph.patch +Patch6: backport-fix-service-update-highest-port-number-for-ceph.patch BuildArch: noarch BuildRequires: autoconf automake desktop-file-utils gettext intltool glib2 glib2-devel systemd-units docbook-style-xsl @@ -234,7 +234,7 @@ fi %{_datadir}/firewalld/testsuite/python/firewalld_test.py %changelog -* Thu Apr 29 2024 baiguo - 1.2.6-3 +* Mon Apr 29 2024 baiguo - 1.2.6-3 - Type:requirement - ID:NA - SUG:NA -- Gitee