From d6d37a4e3ebf0840126b9dedb60e23d86db9c3f8 Mon Sep 17 00:00:00 2001 From: Liwei Ge Date: Thu, 28 Jan 2021 20:31:44 +0800 Subject: [PATCH] rebrand: remove satellite service Signed-off-by: Liwei Ge Change-Id: I342a8be1512b5f4873168b7421f22fc53a73de37 (cherry picked from commit 0979d9900e9eb5dfae3e8346123352876363b8a0) Signed-off-by: zhangbinchen Signed-off-by: hongwei-qin Signed-off-by: ZhouWeitao --- 0001-firewalld-anolis-rebranding.patch | 64 ++++++++++++++++++++++++++ firewalld.spec | 11 ++++- 2 files changed, 74 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 a4ad0e7..5968349 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.3 -Release: 13%{?dist} +Release: 13%{anolis_release}%{?dist} URL: http://www.firewalld.org License: GPLv2+ Source0: https://github.com/firewalld/firewalld/releases/download/v%{version}/firewalld-%{version}.tar.gz @@ -57,6 +58,10 @@ Patch49: v1.0.0-0049-fix-ipset-reduce-cost-of-entry-overlap-detection.patch Patch50: v1.0.0-0050-test-ipset-huge-set-of-entries-benchmark.patch Patch51: v1.0.0-0051-fix-ipset-further-reduce-cost-of-entry-overlap-detec.patch +# Add by Anolis +Patch1000: 0001-firewalld-anolis-rebranding.patch +# End + BuildArch: noarch BuildRequires: autoconf BuildRequires: automake @@ -257,6 +262,10 @@ desktop-file-install --delete-original \ %{_mandir}/man1/firewall-config*.1* %changelog +* Tue Apr 19 2022 Liwei Ge - 0.9.3-13.0.1 +- Remove Satellite service +- cherry-pick [0979d99] + * Thu Feb 03 2022 Eric Garver - 0.9.3-13 - change default CleanupModulesOnExit=yes -- Gitee