Re: [PR PATCH] [Updated] xrootd: update to 5.5.1

[dkwo <dkwo@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 555 bytes --]

There is an updated pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages O3xr
https://github.com/void-linux/void-packages/pull/42076

xrootd: update to 5.5.1
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)

Builds fine with openssl3 #37681 but note https://github.com/xrootd/xrootd/issues/1877
It performs no tests, so it is hard to tell @BenJarg 

A patch file from https://github.com/void-linux/void-packages/pull/42076.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-O3xr-42076.patch --]
[-- Type: text/x-diff, Size: 25535 bytes --]

From 91c7031dabb0bd3190b89170092372fee894ea9c Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 4 Feb 2023 11:51:41 -0500
Subject: [PATCH] xrootd: update to 5.5.2, add musl patch (upstream pr #1908),
 enable tests

---
 srcpkgs/xrootd/patches/musl.patch | 642 +++++++++++++++++++++++-------
 srcpkgs/xrootd/template           |  10 +-
 2 files changed, 503 insertions(+), 149 deletions(-)

diff --git a/srcpkgs/xrootd/patches/musl.patch b/srcpkgs/xrootd/patches/musl.patch
index 7dccd97d6c45..1071a6495ff3 100644
--- a/srcpkgs/xrootd/patches/musl.patch
+++ b/srcpkgs/xrootd/patches/musl.patch
@@ -1,133 +1,144 @@
-diff --git a/src/Xrd/XrdConfig.hh b/src/Xrd/XrdConfig.hh
-index a06ad462f..702403d82 100644
---- a/src/Xrd/XrdConfig.hh
-+++ b/src/Xrd/XrdConfig.hh
-@@ -34,6 +34,11 @@
- #include "Xrd/XrdProtLoad.hh"
- #include "Xrd/XrdProtocol.hh"
- 
-+#if defined(__linux__) && !defined(__GLIBC__)
-+#define __NEED_mode_t
-+#include <bits/alltypes.h>
-+#endif
+From 154d6eac0045c77e1225b21da6273fa54d177374 Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@cern.ch>
+Date: Tue, 14 Feb 2023 16:48:58 +0100
+Subject: [PATCH 1/9] [CMake] Add check for musl libc
+
+Out of principle musl libc provides no means for detecting it, leaving
+developers to figure it out for themselves. The choice here is to use
+the compiler to print the target triple, which contains the libc
+implementation as the last part. On Voidlinux it's x86_64-linux-musl,
+and on Alpine it's x86_64-alpine-linux-musl. This should be reliable
+enough to not wrongly detect other libc implementations as musl (and
+failure to detect will only affect platforms based on musl as well).
+
+See https://wiki.musl-libc.org/faq.html for more information.
+---
+ cmake/XRootDOSDefs.cmake | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/cmake/XRootDOSDefs.cmake b/cmake/XRootDOSDefs.cmake
+index 8b182e61ea1..9f7c9aa5940 100644
+--- a/cmake/XRootDOSDefs.cmake
++++ b/cmake/XRootDOSDefs.cmake
+@@ -70,6 +70,21 @@ if( ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" )
+   set( LINUX TRUE )
+   include( GNUInstallDirs )
+   set( EXTRA_LIBS rt )
 +
- class XrdSysError;
- class XrdTcpMonInfo;
- class XrdNetSecurity;
-diff --git a/src/XrdAcc/XrdAccGroups.cc b/src/XrdAcc/XrdAccGroups.cc
-index e663fdd35..14c3b19d6 100644
---- a/src/XrdAcc/XrdAccGroups.cc
-+++ b/src/XrdAcc/XrdAccGroups.cc
-@@ -46,6 +46,14 @@
- #include "XrdAcc/XrdAccGroups.hh"
- #include "XrdAcc/XrdAccPrivs.hh"
- 
-+#if defined(__linux__) && !defined(__GLIBC__)
-+int innetgr(const char *netgroup, const char *host, const char *user,
-+             const char *domain)
-+{
-+   return 0;
-+}
-+#endif
++  # Check for musl libc with the compiler, since it provides way to detect it
++  execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpmachine
++    OUTPUT_VARIABLE TARGET_TRIPLE ERROR_VARIABLE TARGET_ERROR)
 +
- // Additionally, this routine does not support a user in more than
- // NGROUPS_MAX groups. This is a standard unix limit defined in limits.h.
-   
-diff --git a/src/XrdCl/XrdClFileStateHandler.hh b/src/XrdCl/XrdClFileStateHandler.hh
-index 9f9d8b91f..5ff49cbbc 100644
---- a/src/XrdCl/XrdClFileStateHandler.hh
-+++ b/src/XrdCl/XrdClFileStateHandler.hh
-@@ -42,6 +42,12 @@
- #include <sys/uio.h>
- #include <cstdint>
- 
-+#if defined(__linux__) && !defined(__GLIBC__)
-+#define __NEED_suseconds_t
-+#define __NEED_struct_timeval
-+#include <bits/alltypes.h>
-+#endif
++  if (NOT TARGET_ERROR)
++    if ("${TARGET_TRIPLE}" MATCHES "musl")
++      message(STATUS "Detected musl libc")
++      add_definitions(-DMUSL=1)
++    endif()
++  else()
++    message(WARNING "Could not detect system information!")
++  endif()
 +
- namespace
- {
-   class PgReadHandler;
-diff --git a/src/XrdCl/XrdClMonitor.hh b/src/XrdCl/XrdClMonitor.hh
-index 2fc753777..d22c3c275 100644
---- a/src/XrdCl/XrdClMonitor.hh
-+++ b/src/XrdCl/XrdClMonitor.hh
-@@ -43,6 +43,12 @@
++  unset(TARGET_ERROR)
+ endif()
  
- #include "XrdCl/XrdClFileSystem.hh"
+ #-------------------------------------------------------------------------------
+
+From 41b7fe772c4e55928bbc6d1bc3c5d90ca43947dc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
+Date: Sat, 23 Jul 2022 21:37:47 +0200
+Subject: [PATCH 2/9] Use standard poll.h, errno.h in place of sys/*.h
+
+---
+ src/Xrd/XrdPoll.hh            | 2 +-
+ src/XrdNet/XrdNetMsg.cc       | 2 +-
+ src/XrdOfs/XrdOfsHandle.cc    | 2 +-
+ src/XrdTls/XrdTlsTempCA.cc    | 2 +-
+ src/XrdVoms/XrdVomsMapfile.cc | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/Xrd/XrdPoll.hh b/src/Xrd/XrdPoll.hh
+index 3790b03b080..d9bda5d6277 100644
+--- a/src/Xrd/XrdPoll.hh
++++ b/src/Xrd/XrdPoll.hh
+@@ -29,7 +29,7 @@
+ /* specific prior written permission of the institution or contributor.       */
+ /******************************************************************************/
  
-+#if defined(__linux__) && !defined(__GLIBC__)
-+#define __NEED_suseconds_t
-+#define __NEED_struct_timeval
-+#include <bits/alltypes.h>
-+#endif
-+
- namespace XrdCl
- {
-   class URL;
-diff --git a/src/XrdNet/XrdNetSecurity.cc b/src/XrdNet/XrdNetSecurity.cc
-index 0f8451127..e39b1ef4b 100644
---- a/src/XrdNet/XrdNetSecurity.cc
-+++ b/src/XrdNet/XrdNetSecurity.cc
-@@ -40,12 +40,14 @@
+-#include <sys/poll.h>
++#include <poll.h>
+ #include "XrdSys/XrdSysPthread.hh"
+ 
+ #define XRD_NUMPOLLERS 3
+diff --git a/src/XrdNet/XrdNetMsg.cc b/src/XrdNet/XrdNetMsg.cc
+index fa6c16f872a..f97e1af0996 100644
+--- a/src/XrdNet/XrdNetMsg.cc
++++ b/src/XrdNet/XrdNetMsg.cc
+@@ -29,7 +29,7 @@
+ /******************************************************************************/
+ 
+ #include <cerrno>
+-#include <sys/poll.h>
++#include <poll.h>
+ 
+ #include "XrdNet/XrdNet.hh"
+ #include "XrdNet/XrdNetMsg.hh"
+diff --git a/src/XrdOfs/XrdOfsHandle.cc b/src/XrdOfs/XrdOfsHandle.cc
+index 963f17a5a6a..26b40ce0887 100644
+--- a/src/XrdOfs/XrdOfsHandle.cc
++++ b/src/XrdOfs/XrdOfsHandle.cc
+@@ -30,7 +30,7 @@
+ 
+ #include <cstdio>
+ #include <ctime>
+-#include <sys/errno.h>
++#include <errno.h>
  #include <sys/types.h>
- #include <Winsock2.h>
- #include <io.h>
-+#include "XrdSys/XrdWin32.hh"
-+#endif
-+#if WIN32 || defined(__linux__) && !defined(__GLIBC__)
- int innetgr(const char *netgroup, const char *host, const char *user,
-              const char *domain)
- {
-    return 0;
- }
--#include "XrdSys/XrdWin32.hh"
- #endif
  
- #include "XrdNet/XrdNetAddr.hh"
-diff --git a/src/XrdPosix/XrdPosix.cc b/src/XrdPosix/XrdPosix.cc
-index 0f32dc2ee..b6dea957f 100644
---- a/src/XrdPosix/XrdPosix.cc
-+++ b/src/XrdPosix/XrdPosix.cc
-@@ -37,6 +37,9 @@
+ #include "XrdOfs/XrdOfsHandle.hh"
+diff --git a/src/XrdTls/XrdTlsTempCA.cc b/src/XrdTls/XrdTlsTempCA.cc
+index faf69785ffc..37431dee9f3 100644
+--- a/src/XrdTls/XrdTlsTempCA.cc
++++ b/src/XrdTls/XrdTlsTempCA.cc
+@@ -30,7 +30,7 @@
+ #include <cstdlib>
  #include <fcntl.h>
- #include <unistd.h>
- #include <sys/uio.h>
-+#if defined(__linux__) && !defined(_IO_ERR_SEEN)
-+#include <stdio_ext.h>
-+#endif
+ #include <dirent.h>
+-#include <sys/poll.h>
++#include <poll.h>
  
- #include "XrdSys/XrdSysHeaders.hh"
- #include "XrdPosix/XrdPosixLinkage.hh"
-@@ -311,8 +314,12 @@ size_t XrdPosix_Fread(void *ptr, size_t size, size_t nitems, FILE *stream)
-         if (bytes > 0 && size) rc = bytes/size;
- #ifndef SUNX86
- #if defined(__linux__) || defined(__GNU__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
-+#ifdef _IO_ERR_SEEN
-    else if (bytes < 0) stream->_flags |= _IO_ERR_SEEN;
-    else                stream->_flags |= _IO_EOF_SEEN;
-+#else
-+   else if (bytes < 0) __fseterr(stream);
-+#endif
- #elif defined(__APPLE__) || defined(__FreeBSD__)
-    else if (bytes < 0) stream->_flags |= __SEOF;
-    else                stream->_flags |= __SERR;
-@@ -482,7 +489,11 @@ size_t XrdPosix_Fwrite(const void *ptr, size_t size, size_t nitems, FILE *stream
-    if (bytes > 0 && size) rc = bytes/size;
- #ifndef SUNX86
- #if defined(__linux__) || defined(__GNU__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
-+#ifdef _IO_ERR_SEEN
-       else stream->_flags |= _IO_ERR_SEEN;
-+#else
-+      else  __fseterr(stream);
-+#endif
- #elif defined(__APPLE__) || defined(__FreeBSD__)
-       else stream->_flags |= __SERR;
- #else
+ #include <unordered_set>
+ #include <memory>
+diff --git a/src/XrdVoms/XrdVomsMapfile.cc b/src/XrdVoms/XrdVomsMapfile.cc
+index 8ffbe921875..fddbfdc06fb 100644
+--- a/src/XrdVoms/XrdVomsMapfile.cc
++++ b/src/XrdVoms/XrdVomsMapfile.cc
+@@ -40,7 +40,7 @@
+ #include <vector>
+ #include <string>
+ #include <fcntl.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ 
+ bool XrdVomsMapfile::tried_configure = false;
+ std::unique_ptr<XrdVomsMapfile> XrdVomsMapfile::mapper;
+
+From 29b96ccb34d628daa9d3caac538700909f284061 Mon Sep 17 00:00:00 2001
+From: Ben Jargowsky <benjar63@gmail.com>
+Date: Tue, 14 Feb 2023 17:02:09 +0100
+Subject: [PATCH 3/9] Add (partial) support for musl libc
+
+Based on work from pull request #1632.
+
+Co-authored-by: Guilherme Amadio <amadio@cern.ch>
+---
+ src/XrdPosix/XrdPosixLinkage.hh |  1 +
+ src/XrdPosix/XrdPosixPreload.cc | 16 ++++++++++++++++
+ src/XrdSys/XrdSysPlatform.hh    | 10 +---------
+ src/XrdSys/XrdSysPthread.hh     |  4 ++--
+ 4 files changed, 20 insertions(+), 11 deletions(-)
+
 diff --git a/src/XrdPosix/XrdPosixLinkage.hh b/src/XrdPosix/XrdPosixLinkage.hh
-index 903153252..b5cc6d4b4 100644
+index 9031532524c..b5cc6d4b469 100644
 --- a/src/XrdPosix/XrdPosixLinkage.hh
 +++ b/src/XrdPosix/XrdPosixLinkage.hh
 @@ -40,6 +40,7 @@
@@ -138,31 +149,16 @@ index 903153252..b5cc6d4b4 100644
  #include "XrdSys/XrdSysPlatform.hh"
  
  /******************************************************************************/
-diff --git a/src/XrdPosix/XrdPosixMap.hh b/src/XrdPosix/XrdPosixMap.hh
-index ac2da483a..a15602787 100644
---- a/src/XrdPosix/XrdPosixMap.hh
-+++ b/src/XrdPosix/XrdPosixMap.hh
-@@ -36,6 +36,11 @@
- #include "XrdCl/XrdClFileSystem.hh"
- #include "XrdCl/XrdClXRootDResponses.hh"
- 
-+#if defined(__linux__) && !defined(__GLIBC__)
-+#define __NEED_dev_t
-+#include <bits/alltypes.h>
-+#endif
-+
- class XrdPosixMap
- {
- public:
 diff --git a/src/XrdPosix/XrdPosixPreload.cc b/src/XrdPosix/XrdPosixPreload.cc
-index 867b73479..d967c53b3 100644
+index 867b7347985..e01bc8a2301 100644
 --- a/src/XrdPosix/XrdPosixPreload.cc
 +++ b/src/XrdPosix/XrdPosixPreload.cc
-@@ -42,6 +42,22 @@
+@@ -41,6 +41,22 @@
+ /******************************************************************************/
  
  #include "XrdPosix/XrdPosixExtern.hh"
-  
-+#ifdef creat64
++
++#ifdef MUSL
 +#undef creat64
 +#undef fseeko64
 +#undef ftello64
@@ -177,12 +173,11 @@ index 867b73479..d967c53b3 100644
 +#undef statvfs64
 +#undef truncate64
 +#endif
-+
+  
  /******************************************************************************/
  /*                   G l o b a l   D e c l a r a t i o n s                    */
- /******************************************************************************/
 diff --git a/src/XrdSys/XrdSysPlatform.hh b/src/XrdSys/XrdSysPlatform.hh
-index a1ac544ad..eaeaeabac 100644
+index a1ac544ad93..eaeaeabac58 100644
 --- a/src/XrdSys/XrdSysPlatform.hh
 +++ b/src/XrdSys/XrdSysPlatform.hh
 @@ -241,16 +241,8 @@ extern "C"
@@ -204,7 +199,7 @@ index a1ac544ad..eaeaeabac 100644
  
  #ifdef _LP64
 diff --git a/src/XrdSys/XrdSysPthread.hh b/src/XrdSys/XrdSysPthread.hh
-index 17f8fd0be..78741a7dc 100644
+index 17f8fd0bec8..185ad311014 100644
 --- a/src/XrdSys/XrdSysPthread.hh
 +++ b/src/XrdSys/XrdSysPthread.hh
 @@ -351,7 +351,7 @@ enum PrefType {prefWR=1};
@@ -212,7 +207,7 @@ index 17f8fd0be..78741a7dc 100644
          XrdSysRWLock(PrefType ptype)
                      {
 -#ifdef __linux__
-+#ifdef __GLIBC__
++#if defined(__linux__) && !defined(MUSL)
                       pthread_rwlockattr_t attr;
                       pthread_rwlockattr_setkind_np(&attr,
                               PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
@@ -221,7 +216,362 @@ index 17f8fd0be..78741a7dc 100644
  {
    pthread_rwlock_destroy(&lock);
 -#ifdef __linux__
-+#ifdef __GLIBC__
++#if defined(__linux__) && !defined(MUSL)
    pthread_rwlockattr_t attr;
    pthread_rwlockattr_setkind_np(&attr,
                       PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
+
+From 279c5ae3902e1fd94c0e784b85e4c3909bb0afcf Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@cern.ch>
+Date: Tue, 14 Feb 2023 13:12:19 +0100
+Subject: [PATCH 4/9] Provide dummy implementation of innetgr() when compiling
+ with musl
+
+---
+ src/XrdAcc/XrdAccGroups.cc   |  8 ++++++++
+ src/XrdNet/XrdNetSecurity.cc | 13 ++++++++-----
+ 2 files changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/src/XrdAcc/XrdAccGroups.cc b/src/XrdAcc/XrdAccGroups.cc
+index e663fdd35aa..94b8edbc75e 100644
+--- a/src/XrdAcc/XrdAccGroups.cc
++++ b/src/XrdAcc/XrdAccGroups.cc
+@@ -46,6 +46,14 @@
+ #include "XrdAcc/XrdAccGroups.hh"
+ #include "XrdAcc/XrdAccPrivs.hh"
+ 
++#ifdef MUSL
++int innetgr(const char *netgroup, const char *host, const char *user,
++             const char *domain)
++{
++   return 0;
++}
++#endif
++
+ // Additionally, this routine does not support a user in more than
+ // NGROUPS_MAX groups. This is a standard unix limit defined in limits.h.
+   
+diff --git a/src/XrdNet/XrdNetSecurity.cc b/src/XrdNet/XrdNetSecurity.cc
+index 0f8451127ce..0faf563dd2e 100644
+--- a/src/XrdNet/XrdNetSecurity.cc
++++ b/src/XrdNet/XrdNetSecurity.cc
+@@ -40,11 +40,6 @@
+ #include <sys/types.h>
+ #include <Winsock2.h>
+ #include <io.h>
+-int innetgr(const char *netgroup, const char *host, const char *user,
+-             const char *domain)
+-{
+-   return 0;
+-}
+ #include "XrdSys/XrdWin32.hh"
+ #endif
+ 
+@@ -53,6 +48,14 @@ int innetgr(const char *netgroup, const char *host, const char *user,
+ #include "XrdNet/XrdNetUtils.hh"
+ #include "XrdSys/XrdSysTrace.hh"
+ 
++#if defined(MUSL) || defined(WIN32)
++int innetgr(const char *netgroup, const char *host, const char *user,
++             const char *domain)
++{
++   return 0;
++}
++#endif
++
+ /******************************************************************************/
+ /*                         L o c a l   C l a s s e s                          */
+ /******************************************************************************/
+
+From 5e7adb0de32a1395955469e7ac2eef39aae072f4 Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@cern.ch>
+Date: Tue, 14 Feb 2023 17:12:11 +0100
+Subject: [PATCH 5/9] [XrdOssCsi] Include byteswap.h everywhere except on macOS
+
+---
+ src/XrdOssCsi/XrdOssCsiTagstoreFile.hh | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/XrdOssCsi/XrdOssCsiTagstoreFile.hh b/src/XrdOssCsi/XrdOssCsiTagstoreFile.hh
+index b1a94acd668..0202579ccb4 100644
+--- a/src/XrdOssCsi/XrdOssCsiTagstoreFile.hh
++++ b/src/XrdOssCsi/XrdOssCsiTagstoreFile.hh
+@@ -38,9 +38,7 @@
+ #include <memory>
+ #include <mutex>
+ 
+-#if defined(__GLIBC__) || defined(__BIONIC__) || defined(__CYGWIN__)
+-#include <byteswap.h>
+-#elif defined(__APPLE__)
++#if defined(__APPLE__)
+ // Make sure that byte swap functions are not already defined.
+ #if !defined(bswap_16)
+ // Mac OS X / Darwin features
+@@ -49,6 +47,8 @@
+ #define bswap_32(x) OSSwapInt32(x)
+ #define bswap_64(x) OSSwapInt64(x)
+ #endif
++#else
++#include <byteswap.h>
+ #endif
+ 
+ class XrdOssCsiTagstoreFile : public XrdOssCsiTagstore
+
+From 2b0ed5fe4b264c3ab63f4b170d8398242fa6808f Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@cern.ch>
+Date: Tue, 14 Feb 2023 17:16:03 +0100
+Subject: [PATCH 6/9] Include missing sys/types.h where needed to support musl
+
+---
+ src/Xrd/XrdConfig.hh         | 2 ++
+ src/XrdPosix/XrdPosixFile.hh | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/src/Xrd/XrdConfig.hh b/src/Xrd/XrdConfig.hh
+index a06ad462f4e..2d1403a5e10 100644
+--- a/src/Xrd/XrdConfig.hh
++++ b/src/Xrd/XrdConfig.hh
+@@ -34,6 +34,8 @@
+ #include "Xrd/XrdProtLoad.hh"
+ #include "Xrd/XrdProtocol.hh"
+ 
++#include <sys/types.h>
++
+ class XrdSysError;
+ class XrdTcpMonInfo;
+ class XrdNetSecurity;
+diff --git a/src/XrdPosix/XrdPosixFile.hh b/src/XrdPosix/XrdPosixFile.hh
+index e5cc6b1bda5..4ca9679f233 100644
+--- a/src/XrdPosix/XrdPosixFile.hh
++++ b/src/XrdPosix/XrdPosixFile.hh
+@@ -35,6 +35,7 @@
+ #include <sys/time.h>
+ #include <sys/param.h>
+ #include <sys/resource.h>
++#include <sys/types.h>
+ #include <sys/uio.h>
+ 
+ #include "XrdCl/XrdClFileSystem.hh"
+
+From 8364c6802c2151c6711eea51e079e9855c5c15c3 Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@cern.ch>
+Date: Tue, 14 Feb 2023 17:16:24 +0100
+Subject: [PATCH 7/9] Include missing sys/time.h where needed to support musl
+
+---
+ src/XrdCl/XrdClFileStateHandler.hh | 1 +
+ src/XrdCl/XrdClMonitor.hh          | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/src/XrdCl/XrdClFileStateHandler.hh b/src/XrdCl/XrdClFileStateHandler.hh
+index 197151321f8..f8353881950 100644
+--- a/src/XrdCl/XrdClFileStateHandler.hh
++++ b/src/XrdCl/XrdClFileStateHandler.hh
+@@ -39,6 +39,7 @@
+ #include <set>
+ #include <vector>
+ 
++#include <sys/time.h>
+ #include <sys/uio.h>
+ #include <cstdint>
+ 
+diff --git a/src/XrdCl/XrdClMonitor.hh b/src/XrdCl/XrdClMonitor.hh
+index 2fc7537776a..2b3a96c46fa 100644
+--- a/src/XrdCl/XrdClMonitor.hh
++++ b/src/XrdCl/XrdClMonitor.hh
+@@ -43,6 +43,8 @@
+ 
+ #include "XrdCl/XrdClFileSystem.hh"
+ 
++#include <sys/time.h>
++
+ namespace XrdCl
+ {
+   class URL;
+
+From d7667f94d14e3a38fd5094f952695be529793f46 Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@cern.ch>
+Date: Tue, 14 Feb 2023 11:08:00 +0100
+Subject: [PATCH 8/9] [XrdOuc] Adapt XrdOucBackTrace.cc to support musl
+
+The header execinfo.h is not available on musl, so the #ifdefs
+needed to be adjusted accordingly. This header is available on
+macOS, and with both glibc and uclibc on Linux, though.
+---
+ src/XrdOuc/XrdOucBackTrace.cc | 12 +++++-------
+ 1 file changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/src/XrdOuc/XrdOucBackTrace.cc b/src/XrdOuc/XrdOucBackTrace.cc
+index 813183c3228..c61a89b633d 100644
+--- a/src/XrdOuc/XrdOucBackTrace.cc
++++ b/src/XrdOuc/XrdOucBackTrace.cc
+@@ -34,7 +34,7 @@
+ #include <vector>
+ #include <sys/syscall.h>
+ 
+-#ifdef __GNUC__
++#ifndef MUSL /* glibc, uclibc, and macOS all have execinfo.h */
+ #include <execinfo.h>
+ #include <cxxabi.h>
+ #endif
+@@ -176,13 +176,11 @@ XrdInfo *CvtRsp(const char *name, int snum)
+ /*                              D e m a n g l e                               */
+ /******************************************************************************/
+   
++#ifndef MUSL
+ namespace
+ {
+ int Demangle(char *cSym, char *buff, int blen)
+ {
+-#ifndef __GNUC__
+-   return -1;
+-#else
+    int   status;
+    char *plus = index(cSym, '+');
+    char *brak = (plus ? index(plus, '[') : 0);
+@@ -201,7 +199,6 @@ int Demangle(char *cSym, char *buff, int blen)
+    status = snprintf(buff, blen, "%s %s+%s\n", brak, realname, plus+1);
+    free(realname);
+    return status;
+-#endif
+ }
+ }
+ 
+@@ -221,6 +218,7 @@ int DumpDepth()
+    return (depth <= maxDepth ? depth : maxDepth);
+ }
+ }
++#endif
+ 
+ /******************************************************************************/
+ /*                             D u m p S t a c k                              */
+@@ -230,8 +228,8 @@ namespace
+ {
+ void DumpStack(char *bP, int bL, TidType tid)
+ {
+-#ifndef __GNUC__
+-   snprintf(bP, bL, "TBT " TidFmt " No stack information available, not gnuc.", tid);
++#ifdef MUSL
++   snprintf(bP, bL, "TBT " TidFmt " No stack information available with musl libc.", tid);
+    return;
+ #else
+    static int btDepth = DumpDepth(); // One time MT-safe call
+
+From 4e7ad13df203427cff73e192df4e984e0c954e5b Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@cern.ch>
+Date: Tue, 14 Feb 2023 17:35:56 +0100
+Subject: [PATCH 9/9] [XrdPosix] Add utility functions fseterr/fseteof with
+ musl support
+
+---
+ src/XrdPosix/XrdPosix.cc | 80 ++++++++++++++++++++++++++++------------
+ 1 file changed, 57 insertions(+), 23 deletions(-)
+
+diff --git a/src/XrdPosix/XrdPosix.cc b/src/XrdPosix/XrdPosix.cc
+index 0f32dc2eed5..e4f020c09bf 100644
+--- a/src/XrdPosix/XrdPosix.cc
++++ b/src/XrdPosix/XrdPosix.cc
+@@ -53,6 +53,58 @@
+   
+ extern XrdPosixLinkage   Xunix;
+ 
++/******************************************************************************/
++/*                      U t i l i t y  F u n c t i o n s                      */
++/******************************************************************************/
++
++#ifdef MUSL
++#include <stdio_ext.h>
++#endif
++
++static inline void fseterr(FILE *fp)
++{
++  /* Most systems provide FILE as a struct and the necessary bitmask in
++     <stdio.h>, because they need it for implementing getc() and putc() as
++     fast macros. This function is based on gnulib's fseterr.c */
++#if defined _IO_ERR_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++  /* GNU libc, BeOS, Haiku, Linux libc5 */
++  fp->_flags |= _IO_ERR_SEEN;
++#elif defined __sferror || defined __APPLE__ || defined __DragonFly__ || defined __ANDROID__
++  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
++  fp->_flags |= __SERR;
++#elif defined _IOERR
++  /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
++  fp->_flag |= _IOERR;
++#elif defined __UCLIBC__            /* uClibc */
++  fp->__modeflags |= __FLAG_ERROR;
++#elif defined MUSL /* musl libc */
++  __fseterr(fp);
++#else
++ #error "Unsupported platform! Please report it as a bug."
++#endif
++}
++
++static inline void fseteof(FILE *fp)
++{
++  /* Most systems provide FILE as a struct and the necessary bitmask in
++     <stdio.h>, because they need it for implementing getc() and putc() as
++     fast macros.  */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++  /* GNU libc, BeOS, Haiku, Linux libc5 */
++  fp->_flags |= _IO_EOF_SEEN;
++#elif defined __sferror || defined __APPLE__ || defined __DragonFly__ || defined __ANDROID__
++  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
++  fp->_flags |= __SEOF;
++#elif defined _IOEOF
++  /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
++  fp->_flag |= _IOEOF;
++#elif defined __UCLIBC__            /* uClibc */
++  fp->__modeflags |= __FLAG_EOF;
++#else
++  (void) fseek(fp, 0L, SEEK_END);
++#endif
++}
++
+ /******************************************************************************/
+ /*                       X r d P o s i x _ A c c e s s                        */
+ /******************************************************************************/
+@@ -308,19 +360,9 @@ size_t XrdPosix_Fread(void *ptr, size_t size, size_t nitems, FILE *stream)
+ 
+ // Get the right return code. Note that we cannot emulate the flags in sunx86
+ //
+-        if (bytes > 0 && size) rc = bytes/size;
+-#ifndef SUNX86
+-#if defined(__linux__) || defined(__GNU__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
+-   else if (bytes < 0) stream->_flags |= _IO_ERR_SEEN;
+-   else                stream->_flags |= _IO_EOF_SEEN;
+-#elif defined(__APPLE__) || defined(__FreeBSD__)
+-   else if (bytes < 0) stream->_flags |= __SEOF;
+-   else                stream->_flags |= __SERR;
+-#else
+-   else if (bytes < 0) stream->_flag  |= _IOERR;
+-   else                stream->_flag  |= _IOEOF;
+-#endif
+-#endif
++   if (bytes > 0 && size) rc = bytes/size;
++   else if (bytes < 0) fseterr(stream);
++   else                fseteof(stream);
+ 
+    return rc;
+ }
+@@ -477,18 +519,10 @@ size_t XrdPosix_Fwrite(const void *ptr, size_t size, size_t nitems, FILE *stream
+ 
+    bytes = Xroot.Write(fd, ptr, size*nitems);
+ 
+-// Get the right return code. Note that we cannot emulate the flags in sunx86
++// Get the right return code.
+ //
+    if (bytes > 0 && size) rc = bytes/size;
+-#ifndef SUNX86
+-#if defined(__linux__) || defined(__GNU__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
+-      else stream->_flags |= _IO_ERR_SEEN;
+-#elif defined(__APPLE__) || defined(__FreeBSD__)
+-      else stream->_flags |= __SERR;
+-#else
+-      else stream->_flag  |= _IOERR;
+-#endif
+-#endif
++   else fseterr(stream);
+ 
+    return rc;
+ }
+
diff --git a/srcpkgs/xrootd/template b/srcpkgs/xrootd/template
index 2bd0b59714c2..fa62e7c908ba 100644
--- a/srcpkgs/xrootd/template
+++ b/srcpkgs/xrootd/template
@@ -1,15 +1,19 @@
 # Template file for 'xrootd'
 pkgname=xrootd
-version=5.4.2
+version=5.5.2
 revision=1
 build_style=cmake
-makedepends="zlib-devel openssl-devel libuuid-devel readline-devel"
+configure_args="-DENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=Release"
+hostmakedepends="pkgconf"
+makedepends="zlib-devel openssl-devel libuuid-devel readline-devel
+ libcurl-devel mit-krb5-devel libxml2-devel tinyxml-devel libcppunit-devel
+ fuse-devel json-c-devel"
 short_desc="Low latency, scalable and fault tolerant access to data"
 maintainer="Ben Jargowsky <benjar63@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://xrootd.slac.stanford.edu"
 distfiles="http://xrootd.org/download/v${version}/xrootd-${version}.tar.gz"
-checksum=d868ba5d8b71ec38f7a113d2d8f3e25bbcedc1bc23d21bba1686ddfdb2b900c1
+checksum=ec4e0490b8ee6a3254a4ea4449342aa364bc95b78dc9a8669151be30353863c6
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo"