Merge pull request #22 from stfc/master

upstream v5.7.3

.github/workflows/CI.yml

@@ -89,51 +89,6 @@ jobs:
       run: |
         tests/post-install.sh
         tests/check-headers.sh
-        
-  centos7:
-    name: CentOS 7
-    runs-on: ubuntu-latest
-    container: centos:7
-
-    env:
-      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-      ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node18
-      CMAKE_ARGS: "-DCMAKE_INSTALL_PREFIX=/usr;-DCMAKE_INSTALL_RPATH='$ORIGIN/../$LIB'"
-
-    steps:
-    - name: Use CentOS 7 Vault Repository URLs
-      run: |
-        sed -i -e '/mirrorlist/d' \
-               -e 's/# \?baseurl=/baseurl=/g' \
-               -e 's/mirror.centos.org/vault.centos.org/g' \
-               -e 's/$releasever/7.9.2009/g' \
-               /etc/yum.repos.d/*.repo
-        yum install -y centos-release-scl epel-release
-        sed -i -e '/mirrorlist/d' \
-               -e 's/# \?baseurl=/baseurl=/g' \
-               -e 's/mirror.centos.org/vault.centos.org/g' \
-               -e 's/$releasever/7.9.2009/g' \
-               /etc/yum.repos.d/*.repo
-
-    - name: Install dependencies
-      run: |
-        yum install -y epel-rpm-macros git rpmdevtools sudo yum-utils
-
-    - name: Clone repository
-      uses: actions/checkout@v1
-      with:
-        fetch-depth: 0
-
-    - name: Setup GitHub runner user within container
-      run: adduser --uid 1001 runner && chown -R runner:runner .
-
-    - name: Install XRootD build dependencies
-      run: yum-builddep -y xrootd.spec
-
-    - name: Build and Test with CTest
-      run: |
-        source /opt/rh/devtoolset-7/enable
-        su -p runner -c 'ctest3 -VV -S test.cmake'
   alma8:
     name: Alma 8
     runs-on: ubuntu-latest
@@ -323,7 +278,7 @@ jobs:
 
   macos:
     name: macOS
-    runs-on: macos-13
+    runs-on: macos-15
 
     env:
       CC: clang
@@ -347,7 +302,7 @@ jobs:
       run: ctest -VV --repeat until-pass:3 -S test.cmake
 
     - name: Install with CMake
-      run: cmake --install build
+      run: sudo cmake --install build
 
     - name: Run post-install tests
       run: |

.github/workflows/COV.yml

@@ -31,7 +31,7 @@ env:
 jobs:
   coverage:
     name: Coverage Report
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
     - name: Install dependencies

.github/workflows/QEMU.yml

@@ -11,7 +11,6 @@ on:
         options:
           - alma8
           - alma9
-          - centos7
           - debian
           - fedora
           - ubuntu

.github/workflows/RPM.yml

@@ -19,56 +19,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  centos7:
-    name: CentOS 7
-    runs-on: ubuntu-latest
-    container: centos:7
-
-    env:
-      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
-      ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node18
-
-    steps:
-    - name: Use CentOS 7 Vault Repository URLs
-      run: |
-        sed -i -e '/mirrorlist/d' \
-               -e 's/# \?baseurl=/baseurl=/g' \
-               -e 's/mirror.centos.org/vault.centos.org/g' \
-               -e 's/$releasever/7.9.2009/g' \
-               /etc/yum.repos.d/*.repo
-        yum install -y centos-release-scl epel-release
-        sed -i -e '/mirrorlist/d' \
-               -e 's/# \?baseurl=/baseurl=/g' \
-               -e 's/mirror.centos.org/vault.centos.org/g' \
-               -e 's/$releasever/7.9.2009/g' \
-               /etc/yum.repos.d/*.repo
-
-    - name: Install git
-      run: yum install -y git
-
-    - name: Clone repository
-      uses: actions/checkout@v1
-
-    - name: Install RPM development tools
-      run: |
-        yum install -y epel-rpm-macros rpmdevtools yum-utils
-
-    - name: Install XRootD build dependencies
-      run: yum-builddep -y xrootd.spec
-
-    - name: Build RPMs
-      run: |
-        rpmdev-setuptree
-        git config --global --add safe.directory "$GITHUB_WORKSPACE"
-        git archive --prefix xrootd/ -o $(rpm -E '%{_sourcedir}')/xrootd.tar.gz HEAD
-        rpmbuild -bb --with git xrootd.spec
-
-    - name: Install RPMs
-      run: yum install -y $(rpm -E '%{_rpmdir}')/*/*.rpm
-
-    - name: Run post-install tests
-      run: tests/post-install.sh
-
   alma8:
     name: Alma Linux 8
     runs-on: ubuntu-latest
@@ -162,7 +112,7 @@ jobs:
   alma10beta:
     name: Alma Linux 10 (beta)
     runs-on: ubuntu-latest
-    container: almalinux:9
+    container: almalinux:10-kitten
 
     steps:
     - name: Install git

.github/workflows/macOS.yml

@@ -31,7 +31,7 @@ jobs:
   macos:
     strategy:
       matrix:
-        version: [ 12, 13, 14 ]
+        version: [ 13, 14, 15 ]
       fail-fast: false
 
     name: macOS
@@ -59,7 +59,7 @@ jobs:
       run: ctest -VV --repeat until-pass:3 -S test.cmake
 
     - name: Install with CMake
-      run: cmake --install build
+      run: sudo cmake --install build
 
     - name: Run post-install tests
       run: |

.gitlab-ci.yml

@@ -25,35 +25,6 @@ default:
     paths: [ DEB ]
     expire_in: 1d
 
-.rpm_build_yum: &rpm_build_yum
-  stage: build
-  script:
-    - |
-      sed -i -e '/mirrorlist/d' \
-             -e 's/# \?baseurl=/baseurl=/g' \
-             -e 's/mirror.centos.org/vault.centos.org/g' \
-             -e 's/$releasever/7.9.2009/g' \
-             /etc/yum.repos.d/*.repo
-    - yum install -y centos-release-scl epel-release git
-    - |
-      sed -i -e '/mirrorlist/d' \
-             -e 's/# \?baseurl=/baseurl=/g' \
-             -e 's/mirror.centos.org/vault.centos.org/g' \
-             -e 's/$releasever/7.9.2009/g' \
-             /etc/yum.repos.d/*.repo
-    - yum install -y epel-rpm-macros rpmdevtools yum-utils
-    - yum-builddep -y xrootd.spec
-    - rpmdev-setuptree
-    - git archive --prefix xrootd/ -o $(rpm -E '%{_sourcedir}')/xrootd.tar.gz HEAD
-    - rpmbuild -bb --with git xrootd.spec
-    - yum install -y $(rpm -E '%{_rpmdir}')/*/*.rpm
-    - tests/post-install.sh
-    - mkdir -p RPMS
-    - mv $(rpm -E '%{_rpmdir}')/*/*.rpm RPMS/
-  artifacts:
-    paths: [ RPMS ]
-    expire_in: 1d
-
 .rpm_build_dnf: &rpm_build_dnf
   stage: build
   script:
@@ -86,10 +57,6 @@ Ubuntu 24.04:
   image: ubuntu:24.04
   <<: *deb_build
 
-CentOS 7:
-  image: centos:7
-  <<: *rpm_build_yum
-
 AlmaLinux 8:
   image: almalinux:8
   before_script:

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="https://xrootd.slac.stanford.edu/images/xrootd-logo.png"/>
+  <img src="https://xrootd.github.io/images/xrootd-logo.png"/>
 </p>
 
 ## XRootD: eXtended ROOT Daemon
@@ -34,9 +34,9 @@ can be found on the XRootD website at http://xrootd.org/docs.html.
 
 XRootD is officially supported on the following platforms:
 
- * RedHat Enterprise Linux 7 or later and their derivatives
+ * RedHat Enterprise Linux 8 or later and their derivatives
  * Debian 11 and Ubuntu 22.04 or later
- * macOS 11 (Big Sur) or later
+ * macOS 13 (Ventura) or later
 
 Support for other operating systems is provided on a best-effort basis
 and by contributions from the community.
@@ -46,53 +46,47 @@ and by contributions from the community.
 XRootD is available via official channels in most operating systems.
 Installation via your system's package manager should be preferred.
 
-In RPM-based distributions, like CentOS, Alma, Rocky, Fedora, etc, one can
-search and install XRootD packages with
+In RPM-based distributions, like Alma, Rocky, Fedora, CentOS Stream,
+and RHEL, one can install XRootD with
 
 ```sh
-$ sudo yum install xrootd
-```
-or
-```sh
-$ sudo dnf install xrootd
+dnf install xrootd-client xrootd-server python3-xrootd
 ```
 
 In RHEL-based distributions, it will be necessary to first install the EPEL
-release repository with `yum install epel-release` or `dnf install epel-release`.
-
-If you would like to use our official repository for XRootD RPMs, you can enable
-it on RHEL-based distributions with
-
-```sh
-$ sudo curl -L https://cern.ch/xrootd/xrootd.repo -o /etc/yum.repos.d/xrootd.repo
-```
+release repository with
 
-and on Fedora with
 ```sh
-$ sudo curl -L https://cern.ch/xrootd/xrootd-fedora.repo -o /etc/yum.repos.d/xrootd.repo
+dnf install epel-release
 ```
 
 On Debian 11 or later, and Ubuntu 22.04 or later, XRootD can be installed via apt
 
 ```sh
-$ sudo apt install xrootd-client xrootd-server python3-xrootd
+apt install xrootd-client xrootd-server python3-xrootd
 ```
 
+If you would like to use our official repositories for XRootD packages instead,
+please follow the instructions on our website at one of the links below:
+
+- RPM repositories: http://xrootd.org/dload.html#official-rpm-repositories
+- DEB repositories: http://xrootd.org/dload.html#official-deb-repositories
+
 On macOS, XRootD is available via Homebrew
 ```sh
-$ brew install xrootd
+brew install xrootd
 ```
 
-XRootD can also be installed with conda, as it is also available in conda-forge:
+XRootD can also be installed with conda, as it is available in conda-forge:
 ```sh
-$ conda config --add channels conda-forge
-$ conda config --set channel_priority strict
-$ conda install xrootd
+conda config --add channels conda-forge
+conda config --set channel_priority strict
+conda install xrootd
 ```
 
 Finally, it is possible to install the XRootD python bindings from PyPI using pip:
 ```sh
-$ pip install xrootd
+pip install xrootd
 ```
 
 For detailed instructions on how to build and install XRootD from source code,

docker/Dockerfile.alpine

@@ -0,0 +1,46 @@
+FROM alpine
+
+RUN apk add \
+	bash \
+	cmake \
+	ceph-dev \
+	curl-dev \
+	fuse-dev \
+	fuse3-dev \
+	g++ \
+	git \
+	gtest-dev \
+	isa-l-dev \
+	json-c-dev \
+	krb5-dev \
+	libxml2-dev \
+	linux-headers \
+	make \
+	openssl \
+	openssl-dev \
+	procps \
+	py3-pip \
+	py3-setuptools \
+	py3-wheel \
+	python3-dev \
+	readline-dev \
+	sudo \
+	tinyxml-dev \
+	util-linux-dev \
+	uuidgen \
+	zlib-dev
+
+RUN adduser -D xrootd && echo "xrootd ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers
+
+USER xrootd
+WORKDIR /home/xrootd
+
+COPY xrootd.tar.gz xrootd.tar.gz
+
+RUN tar xf xrootd.tar.gz \
+ && env CMAKE_ARGS='-DCMAKE_INSTALL_PREFIX=/usr' \
+    ctest -VV -S xrootd/test.cmake  \
+ && sudo cmake --install build      \
+ && xrootd/tests/post-install.sh    \
+ && xrootd/tests/check-headers.sh   \
+ && sudo rm -rf /home/xrootd/*