Accepting request 1315031 from science

OBS-URL: https://build.opensuse.org/request/show/1315031
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xrootd?expand=0&rev=45

harden_cmsd@.service.patch

@@ -1,27 +0,0 @@
-Index: xrootd-5.6.1/packaging/common/cmsd@.service
-===================================================================
---- xrootd-5.6.1.orig/packaging/common/cmsd@.service
-+++ xrootd-5.6.1/packaging/common/cmsd@.service
-@@ -6,14 +6,14 @@ Requires=network-online.target
- After=network-online.target
- 
- [Service]
--#PrivateDevices=true
--#ProtectHostname=true
--#ProtectClock=true
--#ProtectKernelTunables=true
--#ProtectKernelModules=true
--#ProtectKernelLogs=true
--#ProtectControlGroups=true
--#RestrictRealtime=true
-+PrivateDevices=true
-+ProtectHostname=true
-+ProtectClock=true
-+ProtectKernelTunables=true
-+ProtectKernelModules=true
-+ProtectKernelLogs=true
-+ProtectControlGroups=true
-+RestrictRealtime=true
- ExecStart=/usr/bin/cmsd -l /var/log/xrootd/cmsd.log -c /etc/xrootd/xrootd-%i.cfg -k fifo -s /run/xrootd/cmsd-%i.pid -n %i
- User=xrootd
- Group=xrootd

harden_frm_purged@.service.patch

@@ -1,27 +0,0 @@
-Index: xrootd-5.6.1/packaging/common/frm_purged@.service
-===================================================================
---- xrootd-5.6.1.orig/packaging/common/frm_purged@.service
-+++ xrootd-5.6.1/packaging/common/frm_purged@.service
-@@ -6,14 +6,14 @@ Requires=network-online.target
- After=network-online.target
- 
- [Service]
--#PrivateDevices=true
--#ProtectHostname=true
--#ProtectClock=true
--#ProtectKernelTunables=true
--#ProtectKernelModules=true
--#ProtectKernelLogs=true
--#ProtectControlGroups=true
--#RestrictRealtime=true
-+PrivateDevices=true
-+ProtectHostname=true
-+ProtectClock=true
-+ProtectKernelTunables=true
-+ProtectKernelModules=true
-+ProtectKernelLogs=true
-+ProtectControlGroups=true
-+RestrictRealtime=true
- ExecStart=/usr/bin/frm_purged -l /var/log/xrootd/frm_purged.log -c /etc/xrootd/xrootd-%i.cfg -k fifo -s /run/xrootd/frm_purged-%i.pid -n %i
- User=xrootd
- Group=xrootd

harden_frm_xfrd@.service.patch

@@ -1,27 +0,0 @@
-Index: xrootd-5.6.1/packaging/common/frm_xfrd@.service
-===================================================================
---- xrootd-5.6.1.orig/packaging/common/frm_xfrd@.service
-+++ xrootd-5.6.1/packaging/common/frm_xfrd@.service
-@@ -6,14 +6,14 @@ Requires=network-online.target
- After=network-online.target
- 
- [Service]
--#PrivateDevices=true
--#ProtectHostname=true
--#ProtectClock=true
--#ProtectKernelTunables=true
--#ProtectKernelModules=true
--#ProtectKernelLogs=true
--#ProtectControlGroups=true
--#RestrictRealtime=true
-+PrivateDevices=true
-+ProtectHostname=true
-+ProtectClock=true
-+ProtectKernelTunables=true
-+ProtectKernelModules=true
-+ProtectKernelLogs=true
-+ProtectControlGroups=true
-+RestrictRealtime=true
- ExecStart=/usr/bin/frm_xfrd -l /var/log/xrootd/frm_xfrd.log -c /etc/xrootd/xrootd-%i.cfg -k fifo -s /run/xrootd/frm_xfrd-%i.pid -n %i
- User=xrootd
- Group=xrootd

harden_xrootd@.service.patch

@@ -1,27 +0,0 @@
-Index: xrootd-5.6.1/packaging/common/xrootd@.service
-===================================================================
---- xrootd-5.6.1.orig/packaging/common/xrootd@.service
-+++ xrootd-5.6.1/packaging/common/xrootd@.service
-@@ -6,14 +6,14 @@ Requires=network-online.target
- After=network-online.target
- 
- [Service]
--#PrivateDevices=true
--#ProtectHostname=true
--#ProtectClock=true
--#ProtectKernelTunables=true
--#ProtectKernelModules=true
--#ProtectKernelLogs=true
--#ProtectControlGroups=true
--#RestrictRealtime=true
-+PrivateDevices=true
-+ProtectHostname=true
-+ProtectClock=true
-+ProtectKernelTunables=true
-+ProtectKernelModules=true
-+ProtectKernelLogs=true
-+ProtectControlGroups=true
-+RestrictRealtime=true
- ExecStart=/usr/bin/xrootd -l /var/log/xrootd/xrootd.log -c /etc/xrootd/xrootd-%i.cfg -k fifo -s /run/xrootd/xrootd-%i.pid -n %i
- User=xrootd
- Group=xrootd

xrootd-5.6.9.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:44196167fbcf030d113e3749dfdecab934c43ec15e38e77481e29aac191ca3a8
-size 6701277

xrootd-5.9.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e08e6fc73aeab08e56f716adafa9476cdfd293e28c14d0af5b1a67c06b1e6831
+size 6944496

xrootd-find-gtest.patch

@@ -0,0 +1,16 @@
+---
+ tests/CMakeLists.txt |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: xrootd-5.7.0/tests/CMakeLists.txt
+===================================================================
+--- xrootd-5.7.0.orig/tests/CMakeLists.txt
++++ xrootd-5.7.0/tests/CMakeLists.txt
+@@ -2,6 +2,7 @@ if(NOT BUILD_TESTS)
+   return()
+ endif()
+ 
++find_package(GTest REQUIRED)
+ include(GoogleTest)
+ 
+ add_subdirectory(common)

xrootd.changes

@@ -1,3 +1,323 @@
+-------------------------------------------------------------------
+Wed Oct 29 07:33:47 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 5.9.0:
+  * New features:
+    - [Server] Implement udprefresh option for the xrd.network
+      directive (gh#xrootd/xrootd#1873).
+    - [Server] New redirect intercept plugin for SENSE.
+    - [XrdCors] Add CORS plugin to XrdHttp (gh#xrootd/xrootd#2541,
+      gh#xrootd/xrootd#2552).
+    - [XrdHttp] Make HTTP's maximum open delay configurable via
+      http.maxdelay option (gh#xrootd/xrootd#2532).
+    - [XrdNet] XRootD monitoring information now follows DNS
+      changes (gh#xrootd/xrootd#1873).
+    - [XrdPfc] Implement URL CGI parameters for setting block-size
+      and max number of blocks for prefetching on per file basis
+      (gh#xrootd/xrootd#2606).
+    - [XrdTls] Allow disabling of X.509 client auth
+      (gh#xrootd/xrootd#2269).
+  * Bug fixes:
+    - [XrdCl] Avoid poller callbacks blocking each other
+      (gh#xrootd/xrootd#2578, gh#xrootd/xrootd#2582).
+    - [XrdCl] Fix URL object lifetime issue causing XCache crash
+      (gh#xrootd/xrootd#2587, gh#xrootd/xrootd#2599).
+    - [XrdSsi] Fix XrdSsi server crash due to use after free
+      (gh#xrootd/xrootd#2479, gh#xrootd/xrootd#2481,
+      gh#xrootd/xrootd#2523).
+    - [XrdSys] Fix a race condition in IOEvents that might cause
+      segfault.
+    - [XrdCl] Fix xrdcp crash when running with record plugin
+      enabled (gh#xrootd/xrootd#2579).
+    - [XrdPfc] Fix deadlock when opening/closing many files
+      concurrently (gh#xrootd/xrootd#2561, gh#xrootd/xrootd#2563).
+    - [Server] Make sure tread create counter increases
+      monotonically (gh#xrootd/xrootd#2597).
+    - [XrdCl] PollerBuiltIn, protection against adding socket
+      during shutdown.
+    - [XrdHttp] Do a clean TLS shutdown for HTTPS
+      (gh#xrootd/xrootd#2565).
+    - [XrdHttp] Fix file renaming with token authentication after
+      redirection (gh#xrootd/xrootd#2550, gh#xrootd/xrootd#2570).
+    - [XrdHttpTpc] Improve mapping of error codes to HTTP status
+      in TPC transfers (gh#xrootd/xrootd#2591).
+    - [XrdOssCsi] Handle pathnames not starting with slash and
+      allow access to FD (gh#xrootd/xrootd#2581,
+      gh#xrootd/xrootd#2594).
+    - [XrdOss] Workaround Mac OS X pecularity with RLIMIT_NOFILE
+      (gh#xrootd/xrootd#2577).
+    - [XrdOuc] Fix memory leak in XrdOucGatherConf
+      (gh#xrootd/xrootd#2583).
+    - [XrdPfc] Return error code for set cache evict if the file
+      does not exist (gh#xrootd/xrootd#2608).
+    - [XrdPosix] Add a missed file object unlock.
+    - [XrdPosix] Set errno for errors from pgRead and pgWrite.
+    - [XrdXrootd] Fix multi-stream copy with xrdcp through XCache
+      (gh#xrootd/xrootd#2592, gh#xrootd/xrootd#2593).
+  * Miscellaneous:
+    - [CMake] Downgrade -Werror=null-dereference back to just a
+      warning (gh#xrootd/xrootd#2571).
+    - [Tests] Add an xcache test, using OssCsi to flag corruption.
+    - [Tests] Extend test suite with more tests with token based
+      authentication.
+    - [XrdHttp] Set the sequential I/O flag for simple HTTP
+      requests.
+    - [XrdOssStats] Add documentation for the OSS statistics
+      plugin.
+    - [XrdPfc] Cleanup processing and storage of pfc.dirstats
+      configuration parameters.
+    - [XrdPfc] Pass full environment into the OSS library loader.
+    - [XrdThrottle] Modify XrdThrottle to be an OSS plugin
+      (gh#xrootd/xrootd#2521).
+    - [XrdThrottle] Re-engineered concurrency limits
+      (gh#xrootd/xrootd#2521).
+
+-------------------------------------------------------------------
+Mon Aug  4 18:44:15 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 5.8.4:
+  * [XrdPfc] Fix XCache crash caused by use-after-free
+    (gh#xrootd/xrootd#2533).
+  * [XrdSecsss] Fix null pointer dereference in
+    XrdSecsssKT::getKey().
+  * [XrdXrootd] Fix server segfaults while computing checksums
+    (gh#xrootd/xrootd#2534).
+  * [CMake] Remove -D from ${XRootD_DEFINITIONS} in
+    XRootDConfig.cmake (gh#xrootd/xrootd#2543).
+  * [Server] Improve rename error message when it fails due to
+    overwrite.
+  * [Tests] Fix memory leak in scitokens test reported by adress
+    sanitizer (gh#xrootd/xrootd#2554).
+  * [XrdApps] Fix memory leak reported by adress sanitizer
+    (gh#xrootd/xrootd#2553).
+  * [XrdCl] Add missing CpRetryPolicy to defaults.
+  * [XrdCl] Avoid losing error response during retry at different
+    server (gh#xrootd/xrootd#2537).
+  * [XrdCl] Do not apply timeout of Channel to its
+    redirect-collapsed replacement (gh#xrootd/xrootd#2549).
+  * [XrdCl] Fix recursive copies with TLS enabled
+    (gh#xrootd/xrootd#2490).
+  * [XrdCl] Request for hostname in replies to locate requests
+    (gh#xrootd/xrootd#2540, gh#xrootd/xrootd#2551).
+  * [XrdOuc] Fix strncpy parameter overlap reported by address
+    sanitizer.
+  * [XrdOssCsi] Do not write sparse tag files when using nofill
+    option (gh#xrootd/xrootd#2557).
+  * [XrdPosix] Fix one-definition-rule (ODR) violations in 32bit
+    systems (gh#xrootd/xrootd#2032).
+  * [XrdPosix] Match function prototypes with respective syscalls
+    (gh#xrootd/xrootd#2032).
+  * [XrdSecsss] Avoid potential use of uninitialized memory in
+    XrdSecsssKT::ktDecode0().
+  * [CMake] Add option to enable sanitizers in test.cmake.
+  * [CMake] Display C/C++ compile flags in configuration summary.
+  * [XrdCl] Add missing CpRetryPolicy to list of defaults.
+  * [XrdOssCsi] Use std::less to compare pointers
+    (gh#xrootd/xrootd#2557).
+  * [Tests] Add simple integration tests for XrdPosix and XrdDig.
+  * [Tests] Add test of connection failure or hostname failure
+    after redirect (gh#xrootd/xrootd#2537).
+
+-------------------------------------------------------------------
+Sat Jun 21 08:06:28 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 5.8.3:
+  * [XrdCl] Fix occasionally missed reply messages from the server
+    (gh#xrootd/xrootd#2516).
+  * [XrdHttp] Fix crash due to thread-safety issue in bridge
+    redrive (gh#xrootd/xrootd#2503).
+  * [XrdPfc] Fix deadlock at startup (gh#xrootd/xrootd#2505,
+    gh#xrootd/xrootd#2507).
+  * [Server] Fix crash caused by race condition in XrdPosix
+    callback handler (gh#xrootd/xrootd#2517).
+  * [XrdHttp] Fix HTTP protocol errors when using
+    X-Transfer-Status (gh#xrootd/xrootd#2443).
+  * [XrdOss] Fix file access mode detection
+    (gh#xrootd/xrootd#2510).
+  * [XrdPfc] Fix file access mode detection
+    (gh#xrootd/xrootd#2508).
+  * [XrdPosix] Correct file open mode conversion
+    (gh#xrootd/xrootd#2510).
+  * [XrdCl] Create directory target by default with recursive
+    copies (gh#xrootd/xrootd#2501).
+  * [CMake] Add Xrd/XrdSendQ.hh to list of installed private
+    headers (gh#xrootd/xrootd#2497).
+  * [XrdHttp] Add unit tests for read failures during transfers
+    (gh#xrootd/xrootd#2443).
+  * [Python] Replace license classifier with SPDX license
+    expression (gh#xrootd/xrootd#2502).
+  * [XrdHttp] Add initial webdav error codes for file path and
+    permission errors (gh#xrootd/xrootd#2261).
+
+-------------------------------------------------------------------
+Sun May 11 09:01:08 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 5.8.2:
+  * [Server] Correct handling of wait during redrive
+    (gh#xrootd/xrootd#2480).
+  * [Server] Enforce reasonable default thread limit of 8192
+    (gh#xrootd/xrootd#2468).
+  * [XrdHttp] Add missing default HTTP status messages
+    (gh#xrootd/xrootd#2486).
+  * [XrdHttp] Handle = sign correctly in URL encoding/decoding
+    (gh#xrootd/xrootd#2491).
+  * [XrdOuc] Redact URL-encoded tokens with % character
+    (gh#xrootd/xrootd#2500).
+  * [XrdPosix] Map operation timeouts to ETIME
+    (gh#xrootd/xrootd#2482).
+  * [XrdPss] Implement the auto-stat protocol for XrdPss
+    (gh#xrootd/xrootd#2454).
+  * [XrdSecsss] Fix issues reported by clang-tidy static analysis.
+  * [XrdSecsss] Protect against buffer overflow due to large key
+    name.
+  * [CMake] General modernization of the build system
+    (gh#xrootd/xrootd#2453).
+  * [CMake] Set stricter baseline compiler warning level.
+  * [Misc] Fix compiler warnings with C++20/23, GCC 15 and Clang
+    20.
+  * [RPM] Revert move to sysusers.d config file for user/group
+    creation.
+  * [Tests] Set a discovery timeout for gtest_discover_tests
+    (gh#xrootd/xrootd#2485).
+- Enable tests for main flavour as part of %check as these no
+  longer require network connectivity; tests for python are too
+  slow and remain disabled.
+
+-------------------------------------------------------------------
+Wed Apr 23 16:03:27 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 5.8.1:
+  - [XrdPss] Enable crc32c as a valid checksum for XrdPss
+    (gh#xrootd/xrootd#2457).
+  * Major bug fixes.
+    - [PMark] Fix null pointer dereference when initializing
+      packet marking handle.
+    - [XrdSsi] Fix null pointer dereference in
+      XrdSsiFileReq::Finalize() (gh#xrootd/xrootd#2469).
+  * Minor bug fixes.
+    - [CMake] Fix install rule for XrdPfc headers
+      (gh#xrootd/xrootd#2478).
+    - [RPM] Workaround for %pre being evaluated before sources are
+      unpacked (gh#xrootd/xrootd#2460).
+    - [XrdHttp] Do not use base64 encoding with crc32c checksums
+      (gh#xrootd/xrootd#2456).
+    - [XrdPfc] Add XrdPfcPurgeQuota plugin to install targets.
+    - [XrdThrottle] Fix Features() function implementation
+      (gh#xrootd/xrootd#2483).
+    - [XrdTpc] Fix third-party copy transfers of small files with
+      curl 8.x (gh#xrootd/xrootd#2470, gh#xrootd/xrootd#2475).
+  * Miscellaneous.
+    - [Misc] Fix GCC 15 compiler warnings.
+    - [Tests] Add new tests for third-party copy transfers with
+      tokens (gh#xrootd/xrootd#2441).
+    - [Tests] Add simple integration test for XCache
+      (gh#xrootd/xrootd#2477).
+    - [XrdCl] Implement description for kXR_fattr requests.
+    - [XrdCl] Update description of kXR_open requests with
+      remaining flags.
+    - [XrdOuc] Use correct format for pthread_t on GNU/Hurd
+      (gh#xrootd/xrootd#2465).
+    - [XrdPss] Include environment CGI info when proxying
+      checksum.
+    - [XrdThrottle] Ensure all virtuals are overrides
+      (gh#xrootd/xrootd#2483).
+    - [XrdTls] Fix deprecation warnings with OpenSSL 3.4 and
+      later.
+
+-------------------------------------------------------------------
+Tue Feb 18 06:20:25 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Drop BuildRequires: tinyxml-devel as it is an impediment to
+  inclusion in Leap:16 and its dropping anyway does not seen to
+  disable any features.
+
+-------------------------------------------------------------------
+Thu Feb 13 12:00:20 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 5.7.3:
+  * [Seckrb5] Avoid null pointer dereference
+    (gh#xrootd/xrootd#2385).
+  * [XrdPfc] Fix file descriptor leak when reading file size from
+    cinfo file (gh#xrootd/xrootd#2392).
+  * [Protocol] do_WriteSpan() - Add written bytes in file
+    statistics (gh#xrootd/xrootd#2368).
+  * [XrdHttp] Correct response code for PUT (from 200 to 201)
+    (gh#xrootd/xrootd#2382).
+  * [XrdHttp] Set oss.asize if object size is known
+    (gh#xrootd/xrootd#2378).
+  * [XrdOfs] Correct forward declaration of XrdSfsFSctl
+    (gh#xrootd/xrootd#2405).
+  * [Misc] Fix compilation with GCC 15 (gh#xrootd/xrootd#2411).
+  * [Tests] Fix check for running process to prevent setup
+    failures.
+  * [XrdCl] Improve checking of logging format strings
+    (gh#xrootd/xrootd#2380).
+  * [XrdSciTokens] Add tests for token-based authorization
+    (gh#xrootd/xrootd#2381).
+- Drop upstreamed hardening patches:
+  * harden_cmsd@.service.patch
+  * harden_frm_purged@.service.patch
+  * harden_frm_xfrd@.service.patch
+  * harden_xrootd@.service.patch
+
+-------------------------------------------------------------------
+Mon Jul  8 17:13:43 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 5.7.0:
+  * [CMake] Move baseline required C++ standard to C++17
+  * [OSS] Add feature setting for Extended Error Text
+  * [Server] Add enhanced error message interface
+  * [Server] Add method to get sanitized env/cgi string
+  * [Server] Implement the kXR_seqio open option for sequential
+    I/O
+  * [XCache] Add new only-if-cached cache control option using
+    XrdPfcFsctl (gh#xrootd/xrootd#2104)
+  * [XrdApps,XrdPss] Add support for pelican:// protocol
+    (gh#xrootd/xrootd#2177, gh#xrootd/xrootd#2171)
+  * [XrdCms] Add new load balancing algorithm with randomized
+    affinity
+  * [XrdCrypto,XrdSecgsi] Update min/default RSA bits to 2048
+    (gh#xrootd/xrootd#2117, gh#xrootd/xrootd#2147)
+  * [XrdHttp] Add new option to allow for tpc unrestricted
+    redirection (gh#xrootd/xrootd#2232, gh#xrootd/xrootd#2228)
+  * [XrdHttp] External handlers can now be loaded without TLS
+    (gh#xrootd/xrootd#2253, gh#xrootd/xrootd#2099,
+    gh#xrootd/xrootd#2123)
+  * [XrdMacaroons] Support negative directives in macaroons.trace
+    option (gh#xrootd/xrootd#2224)
+  * [XrdOuc] Extend XrdOucGatherConf to do more boiler plate work
+    and be extendable
+  * [XrdOuc] Provide method to get the last line from
+    XrdOucGatherConf
+  * [XrdSciTokens] Implement ability to have token groups as a
+    separate claim (gh#xrootd/xrootd#2176)
+  * [XrdSciTokens] New option to configure authorization strategy
+    for tokens (gh#xrootd/xrootd#2205, gh#xrootd/xrootd#2121,
+    gh#xrootd/xrootd#2254)
+  * [XrdThrottle] Add monitoring packet for IO, based on the
+    throttle plugin
+  * [XrdThrottle] Improved handling of timing information on macOS
+    (gh#xrootd/xrootd#2262)
+  * [XrdTpc] Add option to force the destination IP address on a
+    HTTP-TPC (gh#xrootd/xrootd#2172)
+  * [XrdTpc] Add tpc.header2cgi configuration option
+    (gh#xrootd/xrootd#2285, gh#xrootd/xrootd#2283)
+  * For list of bugs fixed, see
+    <https://github.com/xrootd/xrootd/releases/tag/v5.7.0>.
+- Add new BuildRequires to build additional libraries and plugins:
+  * scitokens-cpp-devel
+  * tinyxml-devel
+  * pkgconfig(davix)
+  * pkgconfig(json-c)
+  * pkgconfig(libcurl)
+  * pkgconfig(libisal): only for openSUSE >+ 1650 and 64-bit archs
+  * pkgconfig(libsystemd)
+  * pkgconfig(libtirpc)
+- Add xrootd-find-gtest.patch: Add `find_package` snippet to
+  CMakeLists.txt to avoid linking issues when building tests (we
+  do not, but still this fixes the cmake config for when we
+  might).
+
 -------------------------------------------------------------------
 Thu Mar 14 16:13:05 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
 

xrootd.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xrootd
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,21 +20,35 @@
 %define pname xrootd
 %global flavor @BUILD_FLAVOR@%{nil}
 %if "%{flavor}" == "python"
-%bcond_without python3
 %define psuffix -python
+%bcond_without python3
+# Tests for python bindings are slo...w
+%bcond_with tests
 %else
 %bcond_with python3
 %define psuffix %{nil}
+%bcond_without tests
 %endif
 # /SECTION
 
+# libisal only available for oS >= 1650 and even then only for 64bit archs
+%if 0%{?suse_version} > 1650
+%ifnarch %{ix86}
+%bcond_without system_isal
+%else
+%bcond_with system_isal
+%endif
+%else
+%bcond_with system_isal
+%endif
+
 %define __builder ninja
 %define skip_python2 1
 %define plugver 5
 %bcond_with    ceph
 
 Name:           %{pname}%{psuffix}
-Version:        5.6.9
+Version:        5.9.0
 Release:        0
 Summary:        An eXtended Root Daemon
 License:        LGPL-3.0-or-later
@@ -43,14 +57,8 @@ URL:            https://xrootd.slac.stanford.edu/
 Source0:        https://github.com/xrootd/xrootd/releases/download/v%{version}/%{pname}-%{version}.tar.gz
 Source1:        xrootd-user.conf
 Source100:      xrootd-rpmlintrc
-# PATCH-FEATURE-OPENSUSE Hardening patches
+# PATCH-FIX-UPSTREAM xrootd-find-gtest.patch badshah400@gmail.com -- Add find_package snippet to CMakeLists.txt to avoid linking issues when building tests
-Patch100:       harden_cmsd@.service.patch
+Patch0:         xrootd-find-gtest.patch
-# PATCH-FEATURE-OPENSUSE Hardening patches
-Patch101:       harden_frm_purged@.service.patch
-# PATCH-FEATURE-OPENSUSE Hardening patches
-Patch102:       harden_frm_xfrd@.service.patch
-# PATCH-FEATURE-OPENSUSE Hardening patches
-Patch103:       harden_xrootd@.service.patch
 BuildRequires:  ca-certificates
 BuildRequires:  cmake >= 3.0
 BuildRequires:  fdupes
@@ -59,19 +67,27 @@ BuildRequires:  glibc-devel >= 2.21
 BuildRequires:  ninja
 BuildRequires:  pkgconfig
 BuildRequires:  readline-devel
+BuildRequires:  scitokens-cpp-devel
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  sysuser-tools
+BuildRequires:  pkgconfig(davix)
 BuildRequires:  pkgconfig(fuse)
+BuildRequires:  pkgconfig(json-c)
 BuildRequires:  pkgconfig(krb5)
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(libsystemd)
+BuildRequires:  pkgconfig(libtirpc)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(uuid)
 BuildRequires:  pkgconfig(zlib)
+%if %{with system_isal}
+BuildRequires:  pkgconfig(libisal)
+%endif
 %if %{with ceph}
 BuildRequires:  librados-devel
 BuildRequires:  libradosstriper-devel
 %endif
-BuildRequires:  pkgconfig(libtirpc)
 %if %{with python3}
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module pip}
@@ -82,12 +98,18 @@ BuildRequires:  xrootd-client-devel  = %{version}
 BuildRequires:  xrootd-libs-devel    = %{version}
 BuildRequires:  xrootd-private-devel = %{version}
 BuildRequires:  xrootd-server-devel  = %{version}
+%if %{with tests}
+BuildRequires:  %{python_module pytest}
+%endif
 %define python_subpackage_only 1
 %python_subpackages
 %else
 BuildRequires:  doxygen
 BuildRequires:  graphviz-gnome
 %endif
+%if %{with tests}
+BuildRequires:  pkgconfig(gtest)
+%endif
 
 %description
 The XROOTD project gives access to data repositories.
@@ -314,7 +336,9 @@ popd
 %cmake \
    -DBUILD_PYTHON:BOOL=OFF \
    -DENABLE_CEPH:BOOL=%{with ceph} \
-   -DUSE_LIBC_SEMAPHORE:BOOL=ON
+   -DUSE_LIBC_SEMAPHORE:BOOL=ON \
+   -DBUILD_TESTS:BOOL=%{?with_tests:ON}%{!?with_tests:OFF} \
+   %{nil}
 
 %cmake_build
 doxygen ../Doxyfile
@@ -322,12 +346,16 @@ doxygen ../Doxyfile
 
 %install
 %if %{with python3}
+# Python flavor install
+
 pushd bindings/python
 %pyproject_install
 %python_expand %fdupes %{buildroot}%{$python_sitearch}/
 
+# Python flavor install ends
 %else
 
+# Main flavor install
 %cmake_install
 rm -rf %{buildroot}%{_sysconfdir}/%{pname}/*
 
@@ -356,16 +384,29 @@ install -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/
 
 %fdupes %{buildroot}%{_prefix}
 
-%post libs -p /sbin/ldconfig
+# Main flavor install ends
-%postun libs -p /sbin/ldconfig
+%endif
-%post client-libs -p /sbin/ldconfig
+
-%postun client-libs -p /sbin/ldconfig
+%if %{with tests}
-%post server-libs -p /sbin/ldconfig
+%check
-%postun server-libs -p /sbin/ldconfig
+%if %{with python3}
+export PYTHONPATH+=:%{buildroot}%{python3_sitearch}
+export PYTHONDONTWRITEBYTECODE=1
+pushd ./bindings/python
+%{_bindir}/pytest-%{python3_version} -v
+popd
+%else
+%ctest
+%endif
+%endif
+
+%if "%{flavor}" != "python"
+%ldconfig_scriptlets libs
+%ldconfig_scriptlets client-libs
+%ldconfig_scriptlets server-libs
 
 %if %{with ceph}
-%post ceph -p /sbin/ldconfig
+%ldconfig_scriptlets ceph
-%postun ceph -p /sbin/ldconfig
 %endif
 
 %pre server -f %{pname}.pre
@@ -394,6 +435,10 @@ install -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/
 %{_bindir}/xrdgsiproxy
 %{_bindir}/xrdpinls
 %{_bindir}/xrdreplay
+%if %{with tests}
+# This binary is only used for running tests and is not meant for the end user
+%exclude %{_bindir}/xrdshmap
+%endif
 %{_mandir}/man1/xrdadler32.1%{?ext_man}
 %{_mandir}/man1/xrdcopy.1%{?ext_man}
 %{_mandir}/man1/xrdcp.1%{?ext_man}
@@ -406,6 +451,9 @@ install -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/
 %{_libdir}/libXrdFfs.so.*
 %{_libdir}/libXrdPosix.so.*
 %{_libdir}/libXrdPosixPreload.so.*
+%if %{with system_isal}
+%{_libdir}/libXrdEc.so.*
+%endif
 # This lib may be used for LD_PRELOAD so the .so link needs to be included
 %{_libdir}/libXrdPosixPreload.so
 %dir %{_sysconfdir}/%{pname}/
@@ -417,6 +465,9 @@ install -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/
 %license COPYING.LGPL LICENSE
 %{_bindir}/xrdgsitest
 %{_mandir}/man1/xrdgsitest.1%{?ext_man}
+%if %{with system_isal}
+%{_libdir}/libXrdEc.so
+%endif
 %{_libdir}/libXrdCl.so
 %{_libdir}/libXrdFfs.so
 %{_libdir}/libXrdPosix.so
@@ -441,11 +492,17 @@ install -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/
 %{_libdir}/libXrdHttpUtils.so.*
 %{_libdir}/libXrdUtils.so.*
 %{_libdir}/libXrdXml.so.*
+# Section Plugins
+%{_libdir}/libXrdAccSciTokens-%{plugver}.so
+%{_libdir}/libXrdHttpCors-%{plugver}.so
+%{_libdir}/libXrdHttpTPC-%{plugver}.so
+%{_libdir}/libXrdClHttp-%{plugver}.so
 %{_libdir}/libXrdClProxyPlugin-%{plugver}.so
 %{_libdir}/libXrdSec*-%{plugver}.so
 %{_libdir}/libXrdCksCalczcrc32-%{plugver}.so
 %{_libdir}/libXrdCryptossl-%{plugver}.so
 %{_libdir}/libXrdCmsRedirectLocal-%{plugver}.so
+# /Section
 
 %files libs-devel
 %license COPYING.LGPL LICENSE
@@ -521,7 +578,7 @@ install -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/
 %attr(-,xrootd,xrootd) %config(noreplace) %{_sysconfdir}/%{pname}/xrootd-http.cfg
 %attr(-,xrootd,xrootd) %dir %{_var}/log/%{pname}
 %attr(-,xrootd,xrootd) %dir %{_var}/spool/%{pname}
-%ghost %dir /run/%{pname}
+%ghost %attr(-,xrootd,xrootd) %dir /run/%{pname}
 
 %files server-libs
 %license COPYING.LGPL LICENSE
@@ -537,7 +594,9 @@ install -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/
 %{_libdir}/libXrdOfsPrepGPI-%{plugver}.so
 %{_libdir}/libXrdOssCsi-%{plugver}.so
 %{_libdir}/libXrdOssSIgpfsT-%{plugver}.so
+%{_libdir}/libXrdOssStats-%{plugver}.so
 %{_libdir}/libXrdPfc-%{plugver}.so
+%{_libdir}/libXrdPfcPurgeQuota-%{plugver}.so
 %{_libdir}/libXrdPss-%{plugver}.so
 %{_libdir}/libXrdSsi-%{plugver}.so
 %{_libdir}/libXrdSsiLog-%{plugver}.so