Support for musl libc and uclibc

.github/workflows/build.yml

@@ -208,6 +208,91 @@ jobs:
         # ./common/test-runner ./XrdClTests/libXrdClTests.so 'All Tests/FileSystemTest/'
         # ./common/test-runner ./XrdClTests/libXrdClTests.so 'All Tests/LocalFileHandlerTest/'
 
+  cmake-alpine-musl:
+
+    runs-on: ubuntu-latest
+    container: alpine
+
+    steps:
+    - name: Install external dependencies
+      shell: sh
+      run: |
+        apk add \
+          bash \
+          cmake \
+          cppunit-dev \
+          curl-dev \
+          fuse-dev \
+          fuse3-dev \
+          g++ \
+          git \
+          json-c-dev \
+          krb5-dev \
+          libxml2-dev \
+          linux-headers \
+          make \
+          openssl-dev \
+          py3-pip \
+          python3-dev \
+          readline-dev \
+          tinyxml-dev \
+          util-linux-dev \
+          zlib-dev
+
+    - name: Clone repository
+      uses: actions/checkout@v2
+
+    - name: Build with cmake
+      run: |
+        cd ..
+        # need to fix ownership not to confuse git
+        chown -R -v "$( id -u; ):$( id -g; )" xrootd
+        cmake \
+            -DCMAKE_CXX_STANDARD=17 \
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+            -DCMAKE_INSTALL_PREFIX=/usr \
+            -DCMAKE_INSTALL_LIBDIR=lib \
+            -DPYTHON_EXECUTABLE=$(command -v python3) \
+            -DFORCE_ENABLED=ON \
+            -DENABLE_HTTP=OFF \
+            -DENABLE_TESTS=ON \
+            -DENABLE_VOMS=OFF \
+            -DENABLE_XRDEC=OFF \
+            -DENABLE_XRDCLHTTP=OFF \
+            -DENABLE_MACAROONS=OFF \
+            -DENABLE_SCITOKENS=OFF \
+            -DPIP_OPTIONS="--verbose" \
+            -S xrootd \
+            -B build
+        cmake build -LH
+        cmake \
+            --build build \
+            --clean-first \
+            --parallel $(($(nproc) - 1))
+        cmake --build build --target install
+        python3 -m pip list
+
+    - name: Verify install
+      run: |
+        command -v xrootd
+        command -v xrdcp
+
+    - name: Verify Python bindings
+      run: |
+        python3 --version --version
+        python3 -m pip list
+        python3 -m pip show xrootd
+        python3 -c 'import XRootD; print(XRootD)'
+        python3 -c 'import pyxrootd; print(pyxrootd)'
+        python3 -c 'from XRootD import client; print(client.FileSystem("root://someserver:1094"))'
+
+    - name: Run libXrdCl tests
+      run: |
+        cd ../build/tests
+        ./common/test-runner ./XrdClTests/libXrdClTests.so 'All Tests/UtilsTest/'
+        ./common/test-runner ./XrdClTests/libXrdClTests.so 'All Tests/SocketTest/'
+        ./common/test-runner ./XrdClTests/libXrdClTests.so 'All Tests/PollerTest/'
+
   cmake-centos7:
 
     runs-on: ubuntu-latest

cmake/XRootDOSDefs.cmake

@@ -70,6 +70,21 @@ if( ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" )
   set( LINUX TRUE )
   include( GNUInstallDirs )
   set( EXTRA_LIBS rt )
+
+  # 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)
+
+  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()
+
+  unset(TARGET_ERROR)
 endif()
 
 #-------------------------------------------------------------------------------

docs/PreReleaseNotes.txt

@@ -16,7 +16,5 @@ Prerelease Notes
 + **Major bug fixes**
 
 + **Minor bug fixes**
-  **[PFC]** Add a missing if-error for a rare direct-read error trace.
-  **Commit: 9d2973d1
 
 + **Miscellaneous**

docs/ReleaseNotes.txt

@@ -5,6 +5,21 @@ XRootD
 Release Notes
 =============
 
+-------------
+Version 5.5.3
+-------------
+
++ **Minor bug fixes**
+  **[Pfc]** Add missing if-error for a rare direct-read error trace
+  **[Server]** Avoid a race condition during deferred file close
+  **[XrdCms]** Fix compiler warning for potentially uninitialized variables
+  **[XrdCms]** Remove extraneous character from error output (issue 1501)
+  **[XrdHttp]** Support user-provided script for computing checksums
+  **[XrdPosix]** Add missing include
+
++ **Miscellaneous**
+  **[RPM]** Add g++ as build dependency
+
 -------------
 Version 5.5.2
 -------------

packaging/rhel/xrootd.spec.in

@@ -184,6 +184,8 @@ Requires(postun):	initscripts
 
 %if %{?rhel}%{!?rhel:0} == 7
 BuildRequires: devtoolset-7
+%else
+BuildRequires: gcc-c++
 %endif
 
 %description

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;

src/Xrd/XrdPoll.hh

@@ -29,7 +29,7 @@
 /* specific prior written permission of the institution or contributor.       */
 /******************************************************************************/
 
-#include <sys/poll.h>
+#include <poll.h>
 #include "XrdSys/XrdSysPthread.hh"
 
 #define XRD_NUMPOLLERS 3

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.
 

src/XrdCl/XrdClFileStateHandler.hh

@@ -39,6 +39,7 @@
 #include <set>
 #include <vector>
 
+#include <sys/time.h>
 #include <sys/uio.h>
 #include <cstdint>
 

src/XrdCl/XrdClMonitor.hh

@@ -43,6 +43,8 @@
 
 #include "XrdCl/XrdClFileSystem.hh"
 
+#include <sys/time.h>
+
 namespace XrdCl
 {
   class URL;

src/XrdCl/XrdClXRootDMsgHandler.cc

@@ -1202,9 +1202,7 @@ namespace XrdCl
       if( pStatus.code == errErrorResponse )
       {
         st->errNo = rsp->body.error.errnum;
-        // omit the last character as the string returned from the server
-        // (acording to protocol specs) should be null-terminated
-        std::string errmsg( rsp->body.error.errmsg, rsp->hdr.dlen-5 );
+        std::string errmsg( rsp->body.error.errmsg, rsp->hdr.dlen-4 );
         if( st->errNo == kXR_noReplicas && !pLastError.IsOK() )
           errmsg += " Last seen error: " + pLastError.ToString();
         st->SetErrorMessage( errmsg );

src/XrdCms/XrdCmsCluster.cc

@@ -2036,7 +2036,7 @@ int XrdCmsCluster::Unuseable(XrdCmsSelect &Sel)
 
    int n = snprintf(Sel.Resp.Data, sizeof(Sel.Resp.Data),
                    "No servers are available to %s%s the %s.",
-                   Xmode, Amode, EType)+1;
+                   Xmode, Amode, EType);
     if (n < (int)sizeof(Sel.Resp.Data)) Sel.Resp.DLen = n+1;
        else Sel.Resp.DLen = sizeof(Sel.Resp.Data);
 

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"

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                          */
 /******************************************************************************/

src/XrdOfs/XrdOfsHandle.cc

@@ -30,7 +30,7 @@
 
 #include <cstdio>
 #include <ctime>
-#include <sys/errno.h>
+#include <errno.h>
 #include <sys/types.h>
 
 #include "XrdOfs/XrdOfsHandle.hh"

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

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