From 4bd4cbc9d6e4030fce043503cefba68a1050d9e2 Mon Sep 17 00:00:00 2001
From: Liwei Ge <geliwei@openanolis.org>
Date: Thu, 28 Jan 2021 20:31:44 +0800
Subject: [PATCH] rebrand: remove satellite service

Signed-off-by: Liwei Ge <geliwei@openanolis.org>
Change-Id: I342a8be1512b5f4873168b7421f22fc53a73de37
(cherry picked from commit 0979d9900e9eb5dfae3e8346123352876363b8a0)
Signed-off-by: zhangbinchen <zhangbinchen@openanolis.org>
Signed-off-by: hongwei-qin <qhw01063182@alibaba-inc.com>

Conflicts:
	firewalld.spec
---
 0001-firewalld-anolis-rebranding.patch | 57 ++++++++++++++++++++++++++
 firewalld.spec                         | 11 ++++-
 2 files changed, 67 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..9bebddf
--- /dev/null
+++ b/0001-firewalld-anolis-rebranding.patch
@@ -0,0 +1,57 @@
+diff -Nur firewalld-0.8.2.new/config/Makefile.am firewalld-0.8.2/config/Makefile.am
+--- firewalld-0.8.2.new/config/Makefile.am	2021-01-28 20:24:07.969793747 +0800
++++ firewalld-0.8.2/config/Makefile.am	2021-01-28 20:24:43.112845775 +0800
+@@ -411,6 +411,7 @@
+ 	cp -r $(srcdir)/icmptypes $(DESTDIR)$(prefixlibdir)
+ 	cp -r $(srcdir)/ipsets $(DESTDIR)$(prefixlibdir)
+ 	cp -r $(srcdir)/services $(DESTDIR)$(prefixlibdir)
++	rm -f $(DESTDIR)$(prefixlibdir)/services/RH-Satellite-6.xml
+ 	cp -r $(srcdir)/zones $(DESTDIR)$(prefixlibdir)
+ 	cp -r $(srcdir)/helpers $(DESTDIR)$(prefixlibdir)
+ 
+diff -Nur firewalld-0.8.2.new/config/Makefile.in firewalld-0.8.2/config/Makefile.in
+--- firewalld-0.8.2.new/config/Makefile.in	2021-01-28 20:24:07.969793747 +0800
++++ firewalld-0.8.2/config/Makefile.in	2021-01-28 20:24:43.113845748 +0800
+@@ -1033,6 +1033,7 @@
+ 	cp -r $(srcdir)/icmptypes $(DESTDIR)$(prefixlibdir)
+ 	cp -r $(srcdir)/ipsets $(DESTDIR)$(prefixlibdir)
+ 	cp -r $(srcdir)/services $(DESTDIR)$(prefixlibdir)
++	rm -f $(DESTDIR)$(prefixlibdir)/services/RH-Satellite-6.xml
+ 	cp -r $(srcdir)/zones $(DESTDIR)$(prefixlibdir)
+ 	cp -r $(srcdir)/helpers $(DESTDIR)$(prefixlibdir)
+ 
+diff -Nur firewalld-0.8.2.new/config/services/high-availability.xml firewalld-0.8.2/config/services/high-availability.xml
+--- firewalld-0.8.2.new/config/services/high-availability.xml	2021-01-28 20:24:07.972793666 +0800
++++ firewalld-0.8.2/config/services/high-availability.xml	2021-01-28 20:24:35.009064372 +0800
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <service>
+-  <short>Red Hat High Availability</short>
+-  <description>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.</description>
++  <short>High Availability</short>
++  <description>This allows you to use the High Availability features. Ports are opened for corosync, pcsd, pacemaker_remote, dlm and corosync-qnetd.</description>
+   <port protocol="tcp" port="2224"/>
+   <port protocol="tcp" port="3121"/>
+   <port protocol="tcp" port="5403"/>
+diff -Nur firewalld-0.8.2.new/config/services/RH-Satellite-6.xml firewalld-0.8.2/config/services/RH-Satellite-6.xml
+--- firewalld-0.8.2.new/config/services/RH-Satellite-6.xml	2021-01-28 20:24:07.974793612 +0800
++++ firewalld-0.8.2/config/services/RH-Satellite-6.xml	2021-01-28 20:24:35.009064372 +0800
+@@ -1,18 +0,0 @@
+-<?xml version="1.0" encoding="utf-8"?>
+-<service>
+-  <short>Red Hat Satellite 6</short>
+-  <description>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.</description>
+-  <include service="dns"/>
+-  <include service="http"/>
+-  <include service="https"/>
+-  <include service="dhcp"/>
+-  <include service="tftp"/>
+-  <port protocol="udp" port="68"/>
+-  <port protocol="tcp" port="5000"/>
+-  <port protocol="tcp" port="5646-5647"/>
+-  <port protocol="tcp" port="5671"/>
+-  <port protocol="tcp" port="8000"/>
+-  <port protocol="tcp" port="8080"/>
+-  <port protocol="tcp" port="8140"/>
+-  <port protocol="tcp" port="9090"/>
+-</service>
diff --git a/firewalld.spec b/firewalld.spec
index 675dd16..1b27d21 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: 7%{?dist}
+Release: 7%{anolis_release}%{?dist}
 URL:     http://www.firewalld.org
 License: GPLv2+
 Source0: https://github.com/firewalld/firewalld/releases/download/v%{version}/firewalld-%{version}.tar.gz
@@ -42,6 +43,10 @@ Patch34: 0034-test-zone-verify-overlapping-ports-don-t-halt-zone-l.patch
 Patch35: v1.0.0-0035-fix-ipset-normalize-entries-in-CIDR-notation.patch
 Patch36: v1.0.0-0036-fix-ipset-disallow-overlapping-entries.patch
 
+# Add by Anolis
+Patch1000: 0001-firewalld-anolis-rebranding.patch
+# End
+
 BuildArch: noarch
 BuildRequires: autoconf
 BuildRequires: automake
@@ -242,6 +247,10 @@ desktop-file-install --delete-original \
 %{_mandir}/man1/firewall-config*.1*
 
 %changelog
+* Wed Jan 12 2022 Liwei Ge <geliwei@openanolis.org> - 0.9.3-7.0.1
+- Remove Satellite service
+- cherry-pick [0979d99]
+
 * Tue Jul 13 2021 Eric Garver <egarver@redhat.com> - 0.9.3-7
 - fix(ipset): disallow overlapping entries
 
-- 
Gitee