From 30ec039bd7dbfdc38e24cd42d3d2b0fea03ce21a Mon Sep 17 00:00:00 2001
From: Eric Garver <egarver@redhat.com>
Date: Wed, 6 Nov 2024 17:59:47 -0500
Subject: [PATCH] feat(service): (x)rootd file server

Resolves: RHEL-45253
---
 ...2.0-feat-service-x-rootd-file-server.patch | 52 +++++++++++++++++++
 firewalld.spec                                |  6 ++-
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 0024-v2.2.0-feat-service-x-rootd-file-server.patch

diff --git a/0024-v2.2.0-feat-service-x-rootd-file-server.patch b/0024-v2.2.0-feat-service-x-rootd-file-server.patch
new file mode 100644
index 0000000..3e0614e
--- /dev/null
+++ b/0024-v2.2.0-feat-service-x-rootd-file-server.patch
@@ -0,0 +1,52 @@
+From 8f42ac0312b5a90c0641a7dedd05e37cfa70b40a Mon Sep 17 00:00:00 2001
+From: Pat Riehecky <riehecky@fnal.gov>
+Date: Thu, 16 May 2024 13:17:15 -0500
+Subject: [PATCH 24/24] v2.2.0: feat(service): (x)rootd file server
+
+(cherry picked from commit 365fdcd0f73785cb8ce6a5e4ee225e6fd23dc003)
+---
+ config/Makefile.am        | 1 +
+ config/services/rootd.xml | 6 ++++++
+ po/POTFILES.in            | 1 +
+ 3 files changed, 8 insertions(+)
+ create mode 100644 config/services/rootd.xml
+
+diff --git a/config/Makefile.am b/config/Makefile.am
+index edae25fd9de0..711f05afb799 100644
+--- a/config/Makefile.am
++++ b/config/Makefile.am
+@@ -280,6 +280,7 @@ CONFIG_FILES = \
+ 	services/RH-Satellite-6.xml \
+ 	services/RH-Satellite-6-capsule.xml \
+ 	services/rpc-bind.xml \
++	services/rootd.xml \
+ 	services/rquotad.xml \
+ 	services/rsh.xml \
+ 	services/rsyncd.xml \
+diff --git a/config/services/rootd.xml b/config/services/rootd.xml
+new file mode 100644
+index 000000000000..cf8e99ff8179
+--- /dev/null
++++ b/config/services/rootd.xml
+@@ -0,0 +1,6 @@
++<?xml version="1.0" encoding="utf-8"?>
++<service>
++  <short>rootd</short>
++  <description>The (x)rootd server was developed for the root analysis framework to serve root files. However, the server is agnostic to file types and provides POSIX-like access to any type of file.</description>
++  <port protocol="tcp" port="1094"/>
++</service>
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index adeebdee3f55..a03ff0ce1df3 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -213,6 +213,7 @@ config/services/redis.xml
+ config/services/RH-Satellite-6.xml
+ config/services/RH-Satellite-6-capsule.xml
+ config/services/rpc-bind.xml
++config/services/rootd.xml
+ config/services/rquotad.xml
+ config/services/rsh.xml
+ config/services/rsyncd.xml
+-- 
+2.43.5
+
diff --git a/firewalld.spec b/firewalld.spec
index cad656a..54d28aa 100644
--- a/firewalld.spec
+++ b/firewalld.spec
@@ -1,7 +1,7 @@
 Summary: A firewall daemon with D-Bus interface providing a dynamic firewall
 Name: firewalld
 Version: 1.3.4
-Release: 8%{?dist}
+Release: 9%{?dist}
 URL:     http://www.firewalld.org
 License: GPLv2+
 Source0: https://github.com/firewalld/firewalld/releases/download/v%{version}/firewalld-%{version}.tar.bz2
@@ -28,6 +28,7 @@ Patch20: 0020-v2.2.0-feat-nftables-table-ownership.patch
 Patch21: 0021-v2.2.0-test-nftables-table-ownership.patch
 Patch22: 0022-v2.2.0-chore-service-remove-Conflicts-with-nftables.patch
 Patch23: 0023-v2.2.0-fix-service-update-highest-port-number-for-ce.patch
+Patch24: 0024-v2.2.0-feat-service-x-rootd-file-server.patch
 BuildArch: noarch
 BuildRequires: autoconf
 BuildRequires: automake
@@ -251,6 +252,9 @@ rm -rf %{buildroot}%{_datadir}/firewalld/testsuite
 %{_mandir}/man1/firewall-config*.1*
 
 %changelog
+* Wed Nov 06 2024 Eric Garver <egarver@redhat.com> - 1.3.4-9
+- feat(service): (x)rootd file server
+
 * Wed Nov 06 2024 Eric Garver <egarver@redhat.com> - 1.3.4-8
 - fix(service): update highest port number for ceph