From ed61768648e5521ef56c7dd9aba3b50ba700e617 Mon Sep 17 00:00:00 2001
From: Shahzad Malik Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Mon, 21 Oct 2024 16:39:19 +0200
Subject: [PATCH 1/3] [14.0.X]Backport xrootd 5.7.0

---
 isal.spec                            | 24 ++++++++++++++++++++++++
 scram-tools.file/tools/isal/isal.xml | 10 ++++++++++
 xrootd.spec                          | 11 +++++++----
 3 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 isal.spec
 create mode 100644 scram-tools.file/tools/isal/isal.xml

diff --git a/isal.spec b/isal.spec
new file mode 100644
index 00000000000..87a80854117
--- /dev/null
+++ b/isal.spec
@@ -0,0 +1,24 @@
+### RPM external isal 2.30.0
+
+%define strip_files %i/lib
+%define tag %{realversion}
+%define branch master
+%define github_user xrootd
+Source: https://github.com/intel/isa-l/archive/refs/tags/v%{realversion}.tar.gz
+
+%ifarch x86_64
+BuildRequires: nasm
+%endif
+BuildRequires: autotools
+
+%prep
+%setup -n isa-l-%{realversion}
+
+%build
+./autogen.sh
+./configure --prefix=%{i} --with-pic
+
+make %{makeprocesses}
+
+%install
+make install
diff --git a/scram-tools.file/tools/isal/isal.xml b/scram-tools.file/tools/isal/isal.xml
new file mode 100644
index 00000000000..4ff15b1ee48
--- /dev/null
+++ b/scram-tools.file/tools/isal/isal.xml
@@ -0,0 +1,10 @@
+<tool name="isal" version="@TOOL_VERSION@">
+  <info url="https://github.com/intel/isa-l/wiki"/>
+  <lib name="isal"/>
+  <client>
+    <environment name="ISAL_BASE" default="@TOOL_ROOT@"/>
+    <environment name="LIBDIR" default="$ISAL_BASE/lib"/>
+    <environment name="INCLUDE" default="$ISAL_BASE/include"/>
+  </client>
+  <use name="eigen"/>
+</tool>
diff --git a/xrootd.spec b/xrootd.spec
index b525c3b3f4a..0eefc7340f2 100644
--- a/xrootd.spec
+++ b/xrootd.spec
@@ -1,4 +1,4 @@
-### RPM external xrootd 5.6.4
+### RPM external xrootd 5.7.0
 ## INITENV +PATH LD_LIBRARY_PATH %i/lib64
 ## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES}
 
@@ -6,13 +6,15 @@
 %define tag %{realversion}
 %define branch master
 %define github_user xrootd
-Source: https://xrootd.slac.stanford.edu/download/v%{realversion}/%{n}-%{realversion}.tar.gz
+Source: https://github.com/xrootd/xrootd/releases/download/v%{realversion}/%{n}-%{realversion}.tar.gz
 
 BuildRequires: cmake gmake autotools py3-pip
 Requires: zlib libuuid curl davix
 Requires: python3 py3-setuptools
 Requires: libxml2
 
+Requires: isal
+
 %define soext so
 %ifarch darwin
 %define soext dylib
@@ -39,11 +41,12 @@ cmake ../%n-%{realversion} \
   -DCMAKE_SKIP_RPATH=TRUE \
   -DENABLE_PYTHON=TRUE \
   -DENABLE_HTTP=TRUE \
+  -DENABLE_XRDEC=TRUE \
   -DXRD_PYTHON_REQ_VERSION=3 \
   -DPIP_OPTIONS="--verbose" \
   -DCMAKE_CXX_FLAGS="-I${LIBUUID_ROOT}/include" \
   -DCMAKE_SHARED_LINKER_FLAGS="-L${LIBUUID_ROOT}/lib64" \
-  -DCMAKE_PREFIX_PATH="${ZLIB_ROOT};${PYTHON3_ROOT};${LIBXML2_ROOT};${LIBUUID_ROOT};${CURL_ROOT};${DAVIX_ROOT}"
+  -DCMAKE_PREFIX_PATH="%{cmake_prefix_path}"
 
 make %makeprocesses VERBOSE=1
 
@@ -54,4 +57,4 @@ make install
 
 %post
 %{relocateConfig}bin/xrootd-config
-%{relocateConfig}share/xrootd/cmake/XRootDConfig.cmake
+%{relocateConfig}lib64/cmake/XRootD/XRootDConfig.cmake

From f971a428aa22a3c1047729bee6ca0e1494180740 Mon Sep 17 00:00:00 2001
From: Malik Shahzad Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Thu, 31 Oct 2024 11:57:27 +0100
Subject: [PATCH 2/3] Update xrootd.spec

---
 xrootd.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xrootd.spec b/xrootd.spec
index 0eefc7340f2..e056900e247 100644
--- a/xrootd.spec
+++ b/xrootd.spec
@@ -1,4 +1,4 @@
-### RPM external xrootd 5.7.0
+### RPM external xrootd 5.7.1
 ## INITENV +PATH LD_LIBRARY_PATH %i/lib64
 ## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES}
 

From bde91cddd189fde10efab8c7abcfe6bb7a057c44 Mon Sep 17 00:00:00 2001
From: Malik Shahzad Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Wed, 4 Dec 2024 20:08:42 +0100
Subject: [PATCH 3/3] xrootd 5.7.2

---
 xrootd.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xrootd.spec b/xrootd.spec
index e056900e247..abaf05b6240 100644
--- a/xrootd.spec
+++ b/xrootd.spec
@@ -1,4 +1,4 @@
-### RPM external xrootd 5.7.1
+### RPM external xrootd 5.7.2
 ## INITENV +PATH LD_LIBRARY_PATH %i/lib64
 ## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES}