From ab347d7170a290a5cb242767bedcc9dd00967a3e Mon Sep 17 00:00:00 2001 From: Renbo Date: Wed, 19 Mar 2025 10:33:32 +0800 Subject: [PATCH 1/2] update to firewalld-0.9.11-10 to #IBUJ4B update to firewalld-0.9.11-10 Signed-off-by: Renbo --- 0001-firewalld-anolis-rebranding.patch | 64 ------------------- ...ce-update-highest-port-number-for-ce.patch | 29 +++++++++ firewalld.spec | 12 ++-- 3 files changed, 33 insertions(+), 72 deletions(-) delete mode 100644 0001-firewalld-anolis-rebranding.patch create mode 100644 0031-v2.2.0-fix-service-update-highest-port-number-for-ce.patch diff --git a/0001-firewalld-anolis-rebranding.patch b/0001-firewalld-anolis-rebranding.patch deleted file mode 100644 index 372faea..0000000 --- a/0001-firewalld-anolis-rebranding.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -uNrp firewalld-0.9.3.orig/config/Makefile.am firewalld-0.9.3/config/Makefile.am ---- firewalld-0.9.3.orig/config/Makefile.am 2022-01-19 14:39:35.265788517 +0800 -+++ firewalld-0.9.3/config/Makefile.am 2022-01-19 14:40:48.723950050 +0800 -@@ -235,8 +235,6 @@ CONFIG_FILES = \ - services/rdp.xml \ - services/redis-sentinel.xml \ - services/redis.xml \ -- services/RH-Satellite-6.xml \ -- services/RH-Satellite-6-capsule.xml \ - services/rpc-bind.xml \ - services/rquotad.xml \ - services/rsh.xml \ -diff -uNrp firewalld-0.9.3.orig/config/Makefile.in firewalld-0.9.3/config/Makefile.in ---- firewalld-0.9.3.orig/config/Makefile.in 2022-01-19 14:39:35.263788458 +0800 -+++ firewalld-0.9.3/config/Makefile.in 2022-01-19 14:40:56.754186345 +0800 -@@ -522,8 +522,6 @@ CONFIG_FILES = \ - services/rdp.xml \ - services/redis-sentinel.xml \ - services/redis.xml \ -- services/RH-Satellite-6.xml \ -- services/RH-Satellite-6-capsule.xml \ - services/rpc-bind.xml \ - services/rquotad.xml \ - services/rsh.xml \ -diff -uNrp firewalld-0.9.3.orig/config/services/high-availability.xml firewalld-0.9.3/config/services/high-availability.xml ---- firewalld-0.9.3.orig/config/services/high-availability.xml 2022-01-19 14:39:35.265788517 +0800 -+++ firewalld-0.9.3/config/services/high-availability.xml 2022-01-19 14:43:06.096992441 +0800 -@@ -1,7 +1,7 @@ - - -- Red Hat High Availability -- This allows you to use the Red Hat High Availability (previously named Red Hat Cluster Suite). Ports are opened for corosync, pcsd, pacemaker_remote, dlm and corosync-qnetd. -+ High Availability -+ This allows you to use the High Availability feature. Ports are opened for corosync, pcsd, pacemaker_remote, dlm and corosync-qnetd. - - - -diff -uNrp firewalld-0.9.3.orig/config/services/RH-Satellite-6-capsule.xml firewalld-0.9.3/config/services/RH-Satellite-6-capsule.xml ---- firewalld-0.9.3.orig/config/services/RH-Satellite-6-capsule.xml 2022-01-19 14:39:35.264788488 +0800 -+++ firewalld-0.9.3/config/services/RH-Satellite-6-capsule.xml 1970-01-01 08:00:00.000000000 +0800 -@@ -1,7 +0,0 @@ -- -- -- Red Hat Satellite 6 Capsule -- Red Hat Satellite 6 is a systems management server that can be used to configure new systems, subscribe to updates, and maintain installations in distributed environments. -- -- -- -diff -uNrp firewalld-0.9.3.orig/config/services/RH-Satellite-6.xml firewalld-0.9.3/config/services/RH-Satellite-6.xml ---- firewalld-0.9.3.orig/config/services/RH-Satellite-6.xml 2022-01-19 14:39:35.265788517 +0800 -+++ firewalld-0.9.3/config/services/RH-Satellite-6.xml 1970-01-01 08:00:00.000000000 +0800 -@@ -1,12 +0,0 @@ -- -- -- Red Hat Satellite 6 -- Red Hat Satellite 6 is a systems management server that can be used to configure new systems, subscribe to updates, and maintain installations in distributed environments. -- -- -- -- -- -- -- -- 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 0000000..3f63943 --- /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 1109c86..a1d729f 100644 --- a/firewalld.spec +++ b/firewalld.spec @@ -1,8 +1,7 @@ -%define anolis_release .0.1 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%{?dist} URL: http://www.firewalld.org License: GPLv2+ Source0: https://github.com/firewalld/firewalld/releases/download/v%{version}/firewalld-%{version}.tar.gz @@ -36,10 +35,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 - -# Add by Anolis -Patch1000: 0001-firewalld-anolis-rebranding.patch -# End +Patch31: 0031-v2.2.0-fix-service-update-highest-port-number-for-ce.patch BuildArch: noarch BuildRequires: autoconf @@ -241,8 +237,8 @@ desktop-file-install --delete-original \ %{_mandir}/man1/firewall-config*.1* %changelog -* Sun Sep 29 2024 Liwei Ge - 0.9.11-9.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 -- Gitee From 55210298bfd4e662b87f461681fd774353d9ccfa Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Thu, 28 Jan 2021 20:31:44 +0800 Subject: [PATCH 2/2] rebrand: remove satellite service Signed-off-by: Liwei Ge --- 0001-firewalld-anolis-rebranding.patch | 64 ++++++++++++++++++++++++++ firewalld.spec | 10 +++- 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 0001-firewalld-anolis-rebranding.patch diff --git a/0001-firewalld-anolis-rebranding.patch b/0001-firewalld-anolis-rebranding.patch new file mode 100644 index 0000000..372faea --- /dev/null +++ b/0001-firewalld-anolis-rebranding.patch @@ -0,0 +1,64 @@ +diff -uNrp firewalld-0.9.3.orig/config/Makefile.am firewalld-0.9.3/config/Makefile.am +--- firewalld-0.9.3.orig/config/Makefile.am 2022-01-19 14:39:35.265788517 +0800 ++++ firewalld-0.9.3/config/Makefile.am 2022-01-19 14:40:48.723950050 +0800 +@@ -235,8 +235,6 @@ CONFIG_FILES = \ + services/rdp.xml \ + services/redis-sentinel.xml \ + services/redis.xml \ +- services/RH-Satellite-6.xml \ +- services/RH-Satellite-6-capsule.xml \ + services/rpc-bind.xml \ + services/rquotad.xml \ + services/rsh.xml \ +diff -uNrp firewalld-0.9.3.orig/config/Makefile.in firewalld-0.9.3/config/Makefile.in +--- firewalld-0.9.3.orig/config/Makefile.in 2022-01-19 14:39:35.263788458 +0800 ++++ firewalld-0.9.3/config/Makefile.in 2022-01-19 14:40:56.754186345 +0800 +@@ -522,8 +522,6 @@ CONFIG_FILES = \ + services/rdp.xml \ + services/redis-sentinel.xml \ + services/redis.xml \ +- services/RH-Satellite-6.xml \ +- services/RH-Satellite-6-capsule.xml \ + services/rpc-bind.xml \ + services/rquotad.xml \ + services/rsh.xml \ +diff -uNrp firewalld-0.9.3.orig/config/services/high-availability.xml firewalld-0.9.3/config/services/high-availability.xml +--- firewalld-0.9.3.orig/config/services/high-availability.xml 2022-01-19 14:39:35.265788517 +0800 ++++ firewalld-0.9.3/config/services/high-availability.xml 2022-01-19 14:43:06.096992441 +0800 +@@ -1,7 +1,7 @@ + + +- Red Hat High Availability +- This allows you to use the Red Hat High Availability (previously named Red Hat Cluster Suite). Ports are opened for corosync, pcsd, pacemaker_remote, dlm and corosync-qnetd. ++ High Availability ++ This allows you to use the High Availability feature. Ports are opened for corosync, pcsd, pacemaker_remote, dlm and corosync-qnetd. + + + +diff -uNrp firewalld-0.9.3.orig/config/services/RH-Satellite-6-capsule.xml firewalld-0.9.3/config/services/RH-Satellite-6-capsule.xml +--- firewalld-0.9.3.orig/config/services/RH-Satellite-6-capsule.xml 2022-01-19 14:39:35.264788488 +0800 ++++ firewalld-0.9.3/config/services/RH-Satellite-6-capsule.xml 1970-01-01 08:00:00.000000000 +0800 +@@ -1,7 +0,0 @@ +- +- +- Red Hat Satellite 6 Capsule +- Red Hat Satellite 6 is a systems management server that can be used to configure new systems, subscribe to updates, and maintain installations in distributed environments. +- +- +- +diff -uNrp firewalld-0.9.3.orig/config/services/RH-Satellite-6.xml firewalld-0.9.3/config/services/RH-Satellite-6.xml +--- firewalld-0.9.3.orig/config/services/RH-Satellite-6.xml 2022-01-19 14:39:35.265788517 +0800 ++++ firewalld-0.9.3/config/services/RH-Satellite-6.xml 1970-01-01 08:00:00.000000000 +0800 +@@ -1,12 +0,0 @@ +- +- +- Red Hat Satellite 6 +- Red Hat Satellite 6 is a systems management server that can be used to configure new systems, subscribe to updates, and maintain installations in distributed environments. +- +- +- +- +- +- +- +- diff --git a/firewalld.spec b/firewalld.spec index a1d729f..e8a5146 100644 --- a/firewalld.spec +++ b/firewalld.spec @@ -1,7 +1,8 @@ +%define anolis_release .0.1 Summary: A firewall daemon with D-Bus interface providing a dynamic firewall Name: firewalld Version: 0.9.11 -Release: 10%{?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 @@ -37,6 +38,10 @@ 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 +# End + BuildArch: noarch BuildRequires: autoconf BuildRequires: automake @@ -237,6 +242,9 @@ desktop-file-install --delete-original \ %{_mandir}/man1/firewall-config*.1* %changelog +* 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 -- Gitee