From 14e91e97a2f6cef3ef540100a9001935b33e1e04 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Mon, 1 Jun 2026 06:16:08 +0200 Subject: [PATCH 1/4] Update to version 5.9.4 --- sources | 2 +- xrootd.spec | 36 ++++++++++++------------------------ 2 files changed, 13 insertions(+), 25 deletions(-) diff --git a/sources b/sources index 55d9300..316c984 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xrootd-5.9.2.tar.gz) = 4d904ba6e10dc4f6b8a3e3bfa306744376c0428f2ed0754d913dfaa6339a46d75711c53b44286d532fe6a0f0db6f1dbeaa6d2f723dc4a556b31c7c691e3f90c3 +SHA512 (xrootd-5.9.4.tar.gz) = 9fa2b92d53f2897163da203b7fb949b55d79444439b2a305af1a5f2a2a4ff40917c089c5db67dabb48a9b37d8a69e892e9418b977060eb2bbd42f98316d2beca diff --git a/xrootd.spec b/xrootd.spec index 7ade4a9..0e65949 100644 --- a/xrootd.spec +++ b/xrootd.spec @@ -13,10 +13,10 @@ Name: xrootd Epoch: 1 -Version: 5.9.2 +Version: 5.9.4 Release: 1%{?dist} Summary: Extended ROOT file server -License: LGPL-3.0-or-later AND BSD-2-Clause AND BSD-3-Clause AND curl AND MIT AND Zlib +License: LGPL-3.0-or-later AND BSD-2-Clause AND BSD-3-Clause AND curl AND MIT AND Zlib AND Apache-2.0 AND MPL-2.0 URL: https://xrootd.web.cern.ch Source0: %{url}/download/v%{version}/%{name}-%{version}.tar.gz Source1: %{name}-sysusers.conf @@ -35,8 +35,6 @@ BuildRequires: openssl-devel BuildRequires: perl-generators BuildRequires: readline-devel BuildRequires: zlib-devel -BuildRequires: doxygen -BuildRequires: graphviz BuildRequires: selinux-policy-devel BuildRequires: systemd-rpm-macros BuildRequires: systemd-devel @@ -44,7 +42,6 @@ BuildRequires: python3-devel BuildRequires: python3-pip BuildRequires: python3-setuptools BuildRequires: python3-wheel -BuildRequires: python3-sphinx BuildRequires: json-c-devel BuildRequires: libmacaroons-devel BuildRequires: libuuid-devel @@ -59,6 +56,10 @@ BuildRequires: libradosstriper-devel %ifnarch %{ix86} BuildRequires: isa-l-devel %endif +# For documentation +BuildRequires: doxygen +BuildRequires: graphviz +BuildRequires: python3-sphinx # For tests BuildRequires: attr BuildRequires: curl @@ -236,6 +237,7 @@ with HTTP repositories. %package ceph Summary: XRootD plugin for interfacing with the Ceph storage platform Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-server-libs%{?_isa} = %{epoch}:%{version}-%{release} %description ceph The xrootd-ceph is an OSS layer plugin for the XRootD server for @@ -358,6 +360,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}/config.d mkdir -p %{buildroot}%{_localstatedir}/log/%{name} mkdir -p %{buildroot}%{_localstatedir}/spool/%{name} +mkdir -p %{buildroot}%{_rundir}/%{name} mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d install -m 644 -p packaging/common/%{name}.logrotate \ @@ -398,25 +401,7 @@ if ( setfattr -n user.testattr -v testvalue testfile ) ; then %ctest -- -E XRootD::badredir else echo "Extended file attributes not supported by file system" - echo "Don't run tests that require them" - exclude="\ -XrdCl::FileCopyTest|\ -XrdCl::FileSystemTest.PlugInTest|\ -XrdCl::FileSystemTest.ServerQueryTest|\ -XrdCl::FileSystemTest.XAttrTest|\ -XrdCl::FileTest.XAttrTest|\ -XrdCl::LocalFileHandlerTest.XAttrTest|\ -XrdCl::ThreadingTest|\ -XrdCl::WorkflowTest.CheckpointTest|\ -XrdCl::WorkflowTest.XAttrWorkflowTest|\ -XrdEc::XrdEcTests|\ -XRootD::authenticated_cluster::test|\ -XRootD::badredir|\ -XRootD::cluster::test|\ -XRootD::http::test|\ -XRootD::posix::test|\ -XRootD::tpc::test" - %ctest -- -E $exclude + echo "*** NOT RUNNING TESTS ***" fi rm testfile @@ -670,6 +655,9 @@ fi %doc %{_pkgdocdir} %changelog +* Mon Jun 01 2026 Mattias Ellert - 1:5.9.4-1 +- Update to version 5.9.4 + * Fri Mar 27 2026 Mattias Ellert - 1:5.9.2-1 - Update to version 5.9.2 - Drop patches accepted upstream or previously backported From 8597a43e9496f24092ab3f544f604f67299453b3 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Tue, 2 Jun 2026 16:57:55 +0200 Subject: [PATCH 2/4] Update to version 5.9.5 --- sources | 2 +- xrootd.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 316c984..d240694 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xrootd-5.9.4.tar.gz) = 9fa2b92d53f2897163da203b7fb949b55d79444439b2a305af1a5f2a2a4ff40917c089c5db67dabb48a9b37d8a69e892e9418b977060eb2bbd42f98316d2beca +SHA512 (xrootd-5.9.5.tar.gz) = 74829f253d34a801cff585c28340dd42cb77eea94cd456243d788e59c3d8ac6fe72a016f82bc56308a59974eba9519cdc087829763c64d5b0b9ba940d2d2eb94 diff --git a/xrootd.spec b/xrootd.spec index 0e65949..a05c14a 100644 --- a/xrootd.spec +++ b/xrootd.spec @@ -13,7 +13,7 @@ Name: xrootd Epoch: 1 -Version: 5.9.4 +Version: 5.9.5 Release: 1%{?dist} Summary: Extended ROOT file server License: LGPL-3.0-or-later AND BSD-2-Clause AND BSD-3-Clause AND curl AND MIT AND Zlib AND Apache-2.0 AND MPL-2.0 @@ -655,6 +655,9 @@ fi %doc %{_pkgdocdir} %changelog +* Tue Jun 02 2026 Mattias Ellert - 1:5.9.5-1 +- Update to version 5.9.5 + * Mon Jun 01 2026 Mattias Ellert - 1:5.9.4-1 - Update to version 5.9.4 From 0f808a585a12cb83f4310b9d82d00f1945c21e87 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Wed, 24 Jun 2026 09:55:13 +0200 Subject: [PATCH 3/4] Update to version 5.9.6 --- sources | 2 +- xrootd.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sources b/sources index d240694..8659290 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xrootd-5.9.5.tar.gz) = 74829f253d34a801cff585c28340dd42cb77eea94cd456243d788e59c3d8ac6fe72a016f82bc56308a59974eba9519cdc087829763c64d5b0b9ba940d2d2eb94 +SHA512 (xrootd-5.9.6.tar.gz) = 577d0345cd8669437b91f1eb95c25e5d823d6de44085fcf75794daf9e4929b09c2652f2fda85c6d1eb0ad5b1f75b92f867c276f8682bccb406c0a1eb10125c10 diff --git a/xrootd.spec b/xrootd.spec index a05c14a..bf0bdff 100644 --- a/xrootd.spec +++ b/xrootd.spec @@ -13,7 +13,7 @@ Name: xrootd Epoch: 1 -Version: 5.9.5 +Version: 5.9.6 Release: 1%{?dist} Summary: Extended ROOT file server License: LGPL-3.0-or-later AND BSD-2-Clause AND BSD-3-Clause AND curl AND MIT AND Zlib AND Apache-2.0 AND MPL-2.0 @@ -65,6 +65,7 @@ BuildRequires: attr BuildRequires: curl BuildRequires: davix BuildRequires: gtest-devel +BuildRequires: jq BuildRequires: krb5-server BuildRequires: krb5-workstation BuildRequires: openssl @@ -655,6 +656,9 @@ fi %doc %{_pkgdocdir} %changelog +* Wed Jun 24 2026 Mattias Ellert - 1:5.9.6-1 +- Update to version 5.9.6 + * Tue Jun 02 2026 Mattias Ellert - 1:5.9.5-1 - Update to version 5.9.5 From 857f3803746e944bb9a7b9cd020610f698eff8f9 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Thu, 13 Aug 2026 08:07:12 +0200 Subject: [PATCH 4/4] Update to version 5.9.7 --- sources | 2 +- xrootd.spec | 23 +++++++++++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 8659290..ba3c8b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xrootd-5.9.6.tar.gz) = 577d0345cd8669437b91f1eb95c25e5d823d6de44085fcf75794daf9e4929b09c2652f2fda85c6d1eb0ad5b1f75b92f867c276f8682bccb406c0a1eb10125c10 +SHA512 (xrootd-5.9.7.tar.gz) = f6a118a556b87881c821d32546e3a9d784578ffba99327821f0dec8de6b29360756cfd99bdc1adf4611490baee24bf9667657519be3a70efbd86345f9ed6a8a7 diff --git a/xrootd.spec b/xrootd.spec index bf0bdff..7363367 100644 --- a/xrootd.spec +++ b/xrootd.spec @@ -13,7 +13,7 @@ Name: xrootd Epoch: 1 -Version: 5.9.6 +Version: 5.9.7 Release: 1%{?dist} Summary: Extended ROOT file server License: LGPL-3.0-or-later AND BSD-2-Clause AND BSD-3-Clause AND curl AND MIT AND Zlib AND Apache-2.0 AND MPL-2.0 @@ -33,6 +33,10 @@ BuildRequires: libxml2-devel BuildRequires: ncurses-devel BuildRequires: openssl-devel BuildRequires: perl-generators +%if %{?fedora}%{!?fedora:0} +# picojson not in RHEL/EPEL +BuildRequires: picojson-devel +%endif BuildRequires: readline-devel BuildRequires: zlib-devel BuildRequires: selinux-policy-devel @@ -264,6 +268,13 @@ This package contains the API documentation of the xrootd libraries. %prep %setup -q +# Delete bundled dependencies +rm src/XrdXml/tinyxml/tiny* +%if %{?fedora}%{!?fedora:0} +# picojson not in RHEL/EPEL +rm -r src/XrdSciTokens/vendor/picojson +%endif + %build %cmake \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -321,6 +332,7 @@ install -m 644 -p packaging/common/frm_xfrd@.service %{buildroot}%{_unitdir} install -m 644 -p packaging/common/frm_purged@.service %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_tmpfilesdir} install -m 644 -p packaging/rhel/xrootd.tmpfiles %{buildroot}%{_tmpfilesdir}/%{name}.conf + mkdir -p %{buildroot}%{_sysusersdir} install -m 644 -p %{SOURCE1} %{buildroot}%{_sysusersdir}/%{name}.conf @@ -399,7 +411,10 @@ done touch testfile if ( setfattr -n user.testattr -v testvalue testfile ) ; then - %ctest -- -E XRootD::badredir + %ctest -- -E \ +XRootD::badredir\|\ +XrdCl::FileSystemTest.PlugInTest\|\ +XrdCl::FileTest.PlugInTest else echo "Extended file attributes not supported by file system" echo "*** NOT RUNNING TESTS ***" @@ -526,6 +541,7 @@ fi %{_libdir}/libXrdUtils.so %{_libdir}/libXrdXml.so %{_libdir}/cmake/XRootD +%{_mandir}/man1/xrootd-config.1* %files client-libs %{_libdir}/libXrdCl.so.* @@ -656,6 +672,9 @@ fi %doc %{_pkgdocdir} %changelog +* Wed Aug 12 2026 Mattias Ellert - 1:5.9.7-1 +- Update to version 5.9.7 + * Wed Jun 24 2026 Mattias Ellert - 1:5.9.6-1 - Update to version 5.9.6