public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/xrootd] epel8: Update to version 6.0.0
@ 2026-11-22  9:05 Mattias Ellert
  0 siblings, 0 replies; only message in thread
From: Mattias Ellert @ 2026-11-22  9:05 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/xrootd
Branch : epel8
Commit : 5ee6a46add24318e3076375d858f492df6ba3504
Author : Mattias Ellert <mattias.ellert@physics.uu.se>
Date   : 2026-04-21T18:03:25+02:00
Stats  : +450/-90 in 10 file(s)
URL    : https://src.fedoraproject.org/rpms/xrootd/c/5ee6a46add24318e3076375d858f492df6ba3504?branch=epel8

Log:
Update to version 6.0.0

---
diff --git a/0001-Add-include-XrdSys-XrdSysPlatform.hh-for-MAXPATHLEN.patch b/0001-Add-include-XrdSys-XrdSysPlatform.hh-for-MAXPATHLEN.patch
new file mode 100644
index 0000000..849c380
--- /dev/null
+++ b/0001-Add-include-XrdSys-XrdSysPlatform.hh-for-MAXPATHLEN.patch
@@ -0,0 +1,37 @@
+From f0cb3ce78d9e1bd2bcac7c43e8b272b9350ec3f6 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Mon, 20 Apr 2026 21:16:11 +0200
+Subject: [PATCH 1/6] Add #include "XrdSys/XrdSysPlatform.hh" for MAXPATHLEN
+
+---
+ src/XrdOssArc/XrdOssArcBackup.cc | 1 +
+ src/XrdOssArc/XrdOssArcConfig.cc | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/XrdOssArc/XrdOssArcBackup.cc b/src/XrdOssArc/XrdOssArcBackup.cc
+index f24912cb9..f49e7bdab 100644
+--- a/src/XrdOssArc/XrdOssArcBackup.cc
++++ b/src/XrdOssArc/XrdOssArcBackup.cc
+@@ -47,6 +47,7 @@
+ #include "XrdOuc/XrdOucStream.hh"
+ 
+ #include "XrdSys/XrdSysError.hh"
++#include "XrdSys/XrdSysPlatform.hh"
+ #include "XrdSys/XrdSysPthread.hh"
+ 
+ /******************************************************************************/
+diff --git a/src/XrdOssArc/XrdOssArcConfig.cc b/src/XrdOssArc/XrdOssArcConfig.cc
+index 7f6ee0ac8..620c0bed1 100644
+--- a/src/XrdOssArc/XrdOssArcConfig.cc
++++ b/src/XrdOssArc/XrdOssArcConfig.cc
+@@ -61,6 +61,7 @@
+ #include "XrdOuc/XrdOucUtils.hh"
+ 
+ #include "XrdSys/XrdSysError.hh"
++#include "XrdSys/XrdSysPlatform.hh"
+ 
+ /******************************************************************************/
+ /*                        G l o b a l   O b j e c t s                         */
+-- 
+2.53.0
+

diff --git a/0001-Increase-timeouts-for-slow-debian-builders.patch b/0001-Increase-timeouts-for-slow-debian-builders.patch
new file mode 100644
index 0000000..ed0ec85
--- /dev/null
+++ b/0001-Increase-timeouts-for-slow-debian-builders.patch
@@ -0,0 +1,71 @@
+From 461010b0811ae5013de534befd89c4c6dbd58037 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Mon, 20 Apr 2026 23:14:11 +0200
+Subject: [PATCH] Increase timeouts for slow debian builders
+
+---
+ tests/XRootD/test.sh      | 2 +-
+ tests/XrdClHttp/setup.sh  | 4 ++--
+ tests/XrdClS3/s3-setup.sh | 4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/tests/XRootD/test.sh b/tests/XRootD/test.sh
+index be160a2cf..e85c09053 100755
+--- a/tests/XRootD/test.sh
++++ b/tests/XRootD/test.sh
+@@ -58,7 +58,7 @@ export XRD_LOGLEVEL XRD_LOGFILE
+ # Reduce default timeouts to catch errors quickly and prevent the test
+ # suite from getting stuck waiting for timeouts while running.
+ 
+-: "${XRD_REQUESTTIMEOUT:=15}"
++: "${XRD_REQUESTTIMEOUT:=60}"
+ : "${XRD_STREAMTIMEOUT:=10}"
+ : "${XRD_TIMEOUTRESOLUTION:=1}"
+ 
+diff --git a/tests/XrdClHttp/setup.sh b/tests/XrdClHttp/setup.sh
+index d3f4ca901..df49308f9 100755
+--- a/tests/XrdClHttp/setup.sh
++++ b/tests/XrdClHttp/setup.sh
+@@ -445,7 +445,7 @@ echo "Cache started at port $CACHE_PORT"
+ 
+ if ! "$BINARY_DIR/bin/xrdscitokens-create-token" \
+     issuer_public.pem issuer_private.pem test_key \
+-    https://localhost:9443 storage.read:/ 600 > "$RUNDIR/token"; then
++    https://localhost:9443 storage.read:/ 3600 > "$RUNDIR/token"; then
+   echo "Failed to generate read token"
+   exit 1
+ fi
+@@ -453,7 +453,7 @@ echo "Sample read token available at $RUNDIR/token"
+ 
+ if ! "$BINARY_DIR/bin/xrdscitokens-create-token" \
+     issuer_public.pem issuer_private.pem test_key \
+-    https://localhost:9443 storage.modify:/ 600 > "$RUNDIR/write.token"; then
++    https://localhost:9443 storage.modify:/ 3600 > "$RUNDIR/write.token"; then
+   echo "Failed to generate write token"
+   exit 1
+ fi
+diff --git a/tests/XrdClS3/s3-setup.sh b/tests/XrdClS3/s3-setup.sh
+index 962824936..4c1d356a2 100755
+--- a/tests/XrdClS3/s3-setup.sh
++++ b/tests/XrdClS3/s3-setup.sh
+@@ -267,7 +267,7 @@ fi
+ 
+ if ! "$BINARY_DIR/bin/xrdscitokens-create-token" \
+     "$RUNDIR/issuer/issuer_public.pem" "$RUNDIR/issuer/issuer_private.pem" test_key \
+-    https://localhost:9443 storage.read:/ 600 > "$RUNDIR/token"; then
++    https://localhost:9443 storage.read:/ 3600 > "$RUNDIR/token"; then
+   echo "Failed to generate read token"
+   exit 1
+ fi
+@@ -275,7 +275,7 @@ echo "Sample read token available at $RUNDIR/token"
+   
+ if ! "$BINARY_DIR/bin/xrdscitokens-create-token" \
+     "$RUNDIR/issuer/issuer_public.pem" "$RUNDIR/issuer/issuer_private.pem" test_key \
+-    https://localhost:9443 storage.modify:/ 600 > "$RUNDIR/write.token"; then
++    https://localhost:9443 storage.modify:/ 3600 > "$RUNDIR/write.token"; then
+   echo "Failed to generate write token"
+   exit 1 
+ fi
+-- 
+2.53.0
+

diff --git a/0001-Unbundle-tinyxml.patch b/0001-Unbundle-tinyxml.patch
new file mode 100644
index 0000000..9c98c2c
--- /dev/null
+++ b/0001-Unbundle-tinyxml.patch
@@ -0,0 +1,62 @@
+From bd81e2e922bd44c755ad77cf29ca45570cc934ec Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Tue, 21 Apr 2026 00:38:07 +0200
+Subject: [PATCH] Unbundle tinyxml
+
+---
+ cmake/FindTinyXml.cmake           | 18 ++++++++++++++++++
+ src/XrdXml/tinyxml/CMakeLists.txt | 12 ++++++++++++
+ 2 files changed, 30 insertions(+)
+ create mode 100644 cmake/FindTinyXml.cmake
+
+diff --git a/cmake/FindTinyXml.cmake b/cmake/FindTinyXml.cmake
+new file mode 100644
+index 000000000..75c752707
+--- /dev/null
++++ b/cmake/FindTinyXml.cmake
+@@ -0,0 +1,18 @@
++FIND_PATH(TINYXML_INCLUDE_DIR tinyxml.h
++  HINTS
++  ${TINYXML_DIR}
++  $ENV{TINYXML_DIR}
++  /usr
++  PATH_SUFFIXES include
++)
++
++FIND_LIBRARY(TINYXML_LIBRARIES tinyxml
++  HINTS
++  ${TINYXML_DIR}
++  $ENV{TINYXML_DIR}
++  /usr
++  PATH_SUFFIXES lib
++)
++
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(TinyXml DEFAULT_MSG TINYXML_LIBRARIES TINYXML_INCLUDE_DIR)
+diff --git a/src/XrdXml/tinyxml/CMakeLists.txt b/src/XrdXml/tinyxml/CMakeLists.txt
+index db7d4924e..f87ed8f46 100644
+--- a/src/XrdXml/tinyxml/CMakeLists.txt
++++ b/src/XrdXml/tinyxml/CMakeLists.txt
+@@ -1,3 +1,13 @@
++find_package(TinyXml)
++
++if(TINYXML_FOUND)
++
++add_library(XrdTinyXml INTERFACE IMPORTED GLOBAL)
++set_property(TARGET XrdTinyXml PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${TINYXML_INCLUDE_DIR}")
++set_property(TARGET XrdTinyXml PROPERTY INTERFACE_LINK_LIBRARIES "${TINYXML_LIBRARIES}")
++
++else()
++
+ add_library(XrdTinyXml OBJECT
+   tinystr.cpp       tinystr.h
+   tinyxml.cpp       tinyxml.h
+@@ -13,3 +23,5 @@ set_target_properties(XrdTinyXml
+ target_include_directories(XrdTinyXml
+   PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+ )
++
++endif()
+-- 
+2.53.0
+

diff --git a/0002-Add-catch-all-work-around-for-missing-gettid.patch b/0002-Add-catch-all-work-around-for-missing-gettid.patch
new file mode 100644
index 0000000..0a208f7
--- /dev/null
+++ b/0002-Add-catch-all-work-around-for-missing-gettid.patch
@@ -0,0 +1,39 @@
+From 0ef5b1a97d1ca0d8258384353165b8545463876a Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Mon, 20 Apr 2026 21:20:48 +0200
+Subject: [PATCH 2/6] Add catch-all work-around for missing gettid
+
+Possibly there are better solutions, but this is consistent with the
+implementation in src/XrdSys/XrdSysPthread.cc
+---
+ src/XrdClHttp/XrdClHttpUtil.cc | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/XrdClHttp/XrdClHttpUtil.cc b/src/XrdClHttp/XrdClHttpUtil.cc
+index a1597b200..7bedb4373 100644
+--- a/src/XrdClHttp/XrdClHttpUtil.cc
++++ b/src/XrdClHttp/XrdClHttpUtil.cc
+@@ -86,16 +86,18 @@ struct WaitingForBroker {
+ namespace {
+ 
+ pid_t getthreadid() {
+-#ifdef __APPLE__
++#if   defined(__APPLE__)
+     uint64_t pth_threadid;
+     pthread_threadid_np(pthread_self(), &pth_threadid);
+     return pth_threadid;
+-#else
++#elif defined(__linux__)
+     // NOTE: glibc 2.30 finally provides a gettid() wrapper; however,
+     // we currently support RHEL 8, which is based on glibc 2.28.  Until
+     // we drop that platform, it's easier to do the syscall directly on Linux
+     // instead of additional ifdef calls.
+     return syscall(SYS_gettid);
++#else
++   return getpid();
+ #endif
+ }
+ 
+-- 
+2.53.0
+

diff --git a/0003-Also-check-for-GNU-in-statx.patch b/0003-Also-check-for-GNU-in-statx.patch
new file mode 100644
index 0000000..487ec14
--- /dev/null
+++ b/0003-Also-check-for-GNU-in-statx.patch
@@ -0,0 +1,39 @@
+From 0492078b60e7ffc50ee8fd2282b5960e264a17b4 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Mon, 20 Apr 2026 21:53:38 +0200
+Subject: [PATCH 3/6] Also check for GNU in statx
+
+---
+ src/XrdSys/XrdSysStatx.hh             | 2 +-
+ tests/XrdSysTests/XrdSysStatxTests.cc | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/XrdSys/XrdSysStatx.hh b/src/XrdSys/XrdSysStatx.hh
+index 13b4894e0..dfaa3f7be 100644
+--- a/src/XrdSys/XrdSysStatx.hh
++++ b/src/XrdSys/XrdSysStatx.hh
+@@ -35,7 +35,7 @@
+ #include <cstring>
+ #include <fcntl.h>
+ 
+-#ifdef __linux__
++#if defined(__linux__) || defined(__GNU__)
+ #include <sys/sysmacros.h>
+ using XrdSysStatx = struct statx;
+ #define HAVE_STATX
+diff --git a/tests/XrdSysTests/XrdSysStatxTests.cc b/tests/XrdSysTests/XrdSysStatxTests.cc
+index d2d7e729f..23d2aaac6 100644
+--- a/tests/XrdSysTests/XrdSysStatxTests.cc
++++ b/tests/XrdSysTests/XrdSysStatxTests.cc
+@@ -27,7 +27,7 @@ TEST_F(XrdSysStatxTests, Stat2StatxBasicFields) {
+ 
+   EXPECT_EQ(stx.stx_mask, (uint32_t)STATX_BASIC_STATS);
+ 
+-#ifdef __linux__
++#if defined(__linux__) || defined(__GNU__)
+   EXPECT_EQ(stx.stx_mode,    (uint16_t)(S_IFREG | 0755));
+   EXPECT_EQ(stx.stx_nlink,   (uint32_t)3);
+   EXPECT_EQ(stx.stx_uid,     (uint32_t)1000);
+-- 
+2.53.0
+

diff --git a/0004-Fix-kerberos-tests-when-usr-sbin-is-not-in-PATH.patch b/0004-Fix-kerberos-tests-when-usr-sbin-is-not-in-PATH.patch
new file mode 100644
index 0000000..67dd202
--- /dev/null
+++ b/0004-Fix-kerberos-tests-when-usr-sbin-is-not-in-PATH.patch
@@ -0,0 +1,45 @@
+From e079b7cb1af1410ed15c7958e089ece6b36c5900 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Mon, 20 Apr 2026 21:55:56 +0200
+Subject: [PATCH 4/6] Fix kerberos tests when /usr/sbin is not in PATH
+
+---
+ tests/krb5/kerberos.sh | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/krb5/kerberos.sh b/tests/krb5/kerberos.sh
+index b4af5e102..5b6405cd9 100755
+--- a/tests/krb5/kerberos.sh
++++ b/tests/krb5/kerberos.sh
+@@ -36,16 +36,16 @@ function setup() {
+ 	popd >/dev/null || exit 1
+ 
+ 	# Create the KDC database
+-	kdb5_util create -s -r XROOTD.ORG -P xrootd
++	/usr/sbin/kdb5_util create -s -r XROOTD.ORG -P xrootd
+ 
+ 	# Start the KDC daemons
+-	krb5kdc -P "${PWD}"/krb5kdc.pid
++	/usr/sbin/krb5kdc -P "${PWD}"/krb5kdc.pid
+ 
+ 	# Not really needed, since we use kadmin.local
+ 	# kadmind -P ${PWD}/kadmind.pid
+ 
+ 	# Add principals for the server and client to KDC database
+-	kadmin.local -r XROOTD.ORG <<-EOF
++	/usr/sbin/kadmin.local -r XROOTD.ORG <<-EOF
+ 	add_principal -randkey -kvno 1 host/localhost@XROOTD.ORG
+ 	ktadd -k krb5.keytab host/localhost
+ 	add_principal xrootd@XROOTD.ORG
+@@ -54,7 +54,7 @@ function setup() {
+ 	EOF
+ 
+ 	# Display KDC database entries
+-	kdb5_util tabdump -o - keyinfo
++	/usr/sbin/kdb5_util tabdump -o - keyinfo
+ 
+ 	# Display contents of server keytab
+ 	klist -kte krb5.keytab
+-- 
+2.53.0
+

diff --git a/0005-Fix-typo-conent-content.patch b/0005-Fix-typo-conent-content.patch
new file mode 100644
index 0000000..3307ead
--- /dev/null
+++ b/0005-Fix-typo-conent-content.patch
@@ -0,0 +1,28 @@
+From 2c5be32cc7afed2c3f67a1bfbc25877f5233cb11 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Mon, 20 Apr 2026 22:04:23 +0200
+Subject: [PATCH 5/6] =?UTF-8?q?Fix=20typo=20conent=20=E2=86=92=20content?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ src/XrdClHttp/XrdClHttpFile.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/XrdClHttp/XrdClHttpFile.cc b/src/XrdClHttp/XrdClHttpFile.cc
+index 3a15470e8..196e4d99c 100644
+--- a/src/XrdClHttp/XrdClHttpFile.cc
++++ b/src/XrdClHttp/XrdClHttpFile.cc
+@@ -557,7 +557,7 @@ File::Fcntl(const XrdCl::Buffer &arg, XrdCl::ResponseHandler *handler,
+                 }
+             }
+             XrdCl::Buffer *respBuff = new XrdCl::Buffer();
+-            m_logger->Debug(kLogXrdClHttp, "Fcntl conent %s", xatt.dump().c_str());
++            m_logger->Debug(kLogXrdClHttp, "Fcntl content %s", xatt.dump().c_str());
+             respBuff->FromString(xatt.dump());
+             obj->Set(respBuff);
+         }
+-- 
+2.53.0
+

diff --git a/0006-Change-file-to-avoid-sed-during-install.patch b/0006-Change-file-to-avoid-sed-during-install.patch
new file mode 100644
index 0000000..fa7fb1f
--- /dev/null
+++ b/0006-Change-file-to-avoid-sed-during-install.patch
@@ -0,0 +1,25 @@
+From 216526c32b894a5bad7b85897decef711f121018 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert@physics.uu.se>
+Date: Mon, 20 Apr 2026 22:42:06 +0200
+Subject: [PATCH 6/6] Change file to avoid sed during install
+
+---
+ config/xrootd-http.cfg | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config/xrootd-http.cfg b/config/xrootd-http.cfg
+index cb707bf84..341f3316c 100644
+--- a/config/xrootd-http.cfg
++++ b/config/xrootd-http.cfg
+@@ -33,7 +33,7 @@ all.pidpath /run/xrootd
+ # In order to start the xrdhttp.socket run:
+ #	systemctl start xrdhttp@http.socket
+ #
+-xrd.protocol XrdHttp:80 /usr/lib64/libXrdHttp.so
++xrd.protocol XrdHttp:80 libXrdHttp.so
+ # More configuration files can be added in /etc/xrootd/config.d/
+ # For example /etc/xrootd/config.d/10-mygrid.cfg and
+ # /etc/xrootd/config.d/98-mysite-specifics.cfg
+-- 
+2.53.0
+

diff --git a/sources b/sources
index 55d9300..a0d612c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xrootd-5.9.2.tar.gz) = 4d904ba6e10dc4f6b8a3e3bfa306744376c0428f2ed0754d913dfaa6339a46d75711c53b44286d532fe6a0f0db6f1dbeaa6d2f723dc4a556b31c7c691e3f90c3
+SHA512 (xrootd-6.0.0.tar.gz) = 1fac24c56464e76c104deabcef0a8910dbdc18f62d93275bf1048142beb0453e05aecddaaf41abe9d183c9bafb015067994a15ae0ffeecdc2875626791d76905

diff --git a/xrootd.spec b/xrootd.spec
index 7ade4a9..78a689d 100644
--- a/xrootd.spec
+++ b/xrootd.spec
@@ -13,7 +13,7 @@
 
 Name:		xrootd
 Epoch:		1
-Version:	5.9.2
+Version:	6.0.0
 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
@@ -21,6 +21,16 @@ URL:		https://xrootd.web.cern.ch
 Source0:	%{url}/download/v%{version}/%{name}-%{version}.tar.gz
 Source1:	%{name}-sysusers.conf
 
+#		https://github.com/xrootd/xrootd/pull/2769
+Patch0:		0001-Add-include-XrdSys-XrdSysPlatform.hh-for-MAXPATHLEN.patch
+Patch1:		0002-Add-catch-all-work-around-for-missing-gettid.patch
+Patch2:		0003-Also-check-for-GNU-in-statx.patch
+Patch3:		0004-Fix-kerberos-tests-when-usr-sbin-is-not-in-PATH.patch
+Patch4:		0005-Fix-typo-conent-content.patch
+Patch5:		0006-Change-file-to-avoid-sed-during-install.patch
+#		Unbundle tinyxml library
+Patch6:		0001-Unbundle-tinyxml.patch
+
 BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	make
@@ -30,13 +40,12 @@ BuildRequires:	krb5-devel
 BuildRequires:	libcurl-devel
 BuildRequires:	tinyxml-devel
 BuildRequires:	libxml2-devel
+BuildRequires:	libzip-devel
 BuildRequires:	ncurses-devel
 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,13 +53,12 @@ BuildRequires:	python3-devel
 BuildRequires:	python3-pip
 BuildRequires:	python3-setuptools
 BuildRequires:	python3-wheel
-BuildRequires:	python3-sphinx
 BuildRequires:	json-c-devel
+BuildRequires:	json-devel
 BuildRequires:	libmacaroons-devel
 BuildRequires:	libuuid-devel
 BuildRequires:	voms-devel
 BuildRequires:	scitokens-cpp-devel
-BuildRequires:	davix-devel
 BuildRequires:	libxcrypt-devel
 %if %{ceph}
 BuildRequires:	librados-devel
@@ -59,15 +67,19 @@ 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
-BuildRequires:	davix
 BuildRequires:	gtest-devel
 BuildRequires:	krb5-server
 BuildRequires:	krb5-workstation
 BuildRequires:	openssl
 BuildRequires:	procps
+BuildRequires:	sqlite
 
 Requires:	%{name}-server%{?_isa} = %{epoch}:%{version}-%{release}
 Requires:	%{name}-selinux = %{epoch}:%{version}-%{release}
@@ -129,6 +141,8 @@ development.
 
 %package client-libs
 Summary:	Libraries used by xrootd clients
+Provides:	xrdcl-http = %{epoch}:%{version}-%{release}
+Obsoletes:	xrdcl-http < 1:6.0.0
 Requires:	%{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 
 %description client-libs
@@ -223,15 +237,6 @@ SciToken passed during a transfer. Configured appropriately, this
 allows the XRootD server admin to delegate authorization decisions for
 a subset of the namespace to an external issuer.
 
-%package -n xrdcl-http
-Summary:	HTTP client plugin for XRootD
-Requires:	%{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
-Requires:	%{name}-client-libs%{?_isa} = %{epoch}:%{version}-%{release}
-
-%description -n xrdcl-http
-xrdcl-http is an XRootD client plugin which allows XRootD to interact
-with HTTP repositories.
-
 %if %{ceph}
 %package ceph
 Summary:	XRootD plugin for interfacing with the Ceph storage platform
@@ -261,6 +266,14 @@ This package contains the API documentation of the xrootd libraries.
 %prep
 %setup -q
 
+%patch -P0 -p1
+%patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1
+%patch -P4 -p1
+%patch -P5 -p1
+%patch -P6 -p1
+
 %build
 %cmake \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
@@ -269,8 +282,8 @@ This package contains the API documentation of the xrootd libraries.
 %if %{ceph}
     -DENABLE_CEPH:BOOL=ON \
 %endif
-%ifarch %{ix86}
-    -DENABLE_XRDEC:BOOL=OFF \
+%ifnarch %{ix86}
+    -DENABLE_XRDEC:BOOL=ON \
 %endif
 %if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 9
     -DPIP_OPTIONS="--no-deps --use-pep517 --no-build-isolation --disable-pip-version-check --verbose" \
@@ -280,7 +293,7 @@ This package contains the API documentation of the xrootd libraries.
     -DXRD_PYTHON_REQ_VERSION=%{python3_version}
 %cmake_build
 
-make -C packaging/common -f /usr/share/selinux/devel/Makefile
+make -C config -f /usr/share/selinux/devel/Makefile
 
 doxygen Doxyfile
 # Use local image instead of remote
@@ -306,44 +319,43 @@ rm -f %{buildroot}%{_libdir}/cmake/XRootD/uninstall.cmake
 LD_LIBRARY_PATH=%{buildroot}%{_libdir} \
 PYTHONPATH=%{buildroot}%{python3_sitearch} \
 PYTHONDONTWRITEBYTECODE=1 \
-make -C bindings/python/docs html
+make -C python/docs html
 
 # Service unit files
 mkdir -p %{buildroot}%{_unitdir}
-install -m 644 -p packaging/common/xrootd@.service %{buildroot}%{_unitdir}
-install -m 644 -p packaging/common/xrootd@.socket %{buildroot}%{_unitdir}
-install -m 644 -p packaging/common/xrdhttp@.socket %{buildroot}%{_unitdir}
-install -m 644 -p packaging/common/cmsd@.service %{buildroot}%{_unitdir}
-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
+install -m 644 -p systemd/xrootd@.service %{buildroot}%{_unitdir}
+install -m 644 -p systemd/xrootd@.socket %{buildroot}%{_unitdir}
+install -m 644 -p systemd/xrdhttp@.socket %{buildroot}%{_unitdir}
+install -m 644 -p systemd/cmsd@.service %{buildroot}%{_unitdir}
+install -m 644 -p systemd/frm_xfrd@.service %{buildroot}%{_unitdir}
+install -m 644 -p systemd/frm_purged@.service %{buildroot}%{_unitdir}
+
 mkdir -p %{buildroot}%{_sysusersdir}
 install -m 644 -p %{SOURCE1} %{buildroot}%{_sysusersdir}/%{name}.conf
 
 # Server config
 mkdir -p %{buildroot}%{_sysconfdir}/%{name}
-install -m 644 -p packaging/common/%{name}-clustered.cfg \
+install -m 644 -p config/%{name}-clustered.cfg \
     %{buildroot}%{_sysconfdir}/%{name}/%{name}-clustered.cfg
-install -m 644 -p packaging/common/%{name}-standalone.cfg \
+install -m 644 -p config/%{name}-standalone.cfg \
     %{buildroot}%{_sysconfdir}/%{name}/%{name}-standalone.cfg
-install -m 644 -p packaging/common/%{name}-filecache-clustered.cfg \
+install -m 644 -p config/%{name}-filecache-clustered.cfg \
     %{buildroot}%{_sysconfdir}/%{name}/%{name}-filecache-clustered.cfg
-install -m 644 -p packaging/common/%{name}-filecache-standalone.cfg \
+install -m 644 -p config/%{name}-filecache-standalone.cfg \
     %{buildroot}%{_sysconfdir}/%{name}/%{name}-filecache-standalone.cfg
-sed 's!/usr/lib64/!!' packaging/common/%{name}-http.cfg > \
+install -m 644 -p config/%{name}-http.cfg \
     %{buildroot}%{_sysconfdir}/%{name}/%{name}-http.cfg
 
 # Client config
 mkdir -p %{buildroot}%{_sysconfdir}/%{name}/client.plugins.d
-install -m 644 -p packaging/common/client.conf \
+install -m 644 -p config/client.conf \
     %{buildroot}%{_sysconfdir}/%{name}/client.conf
-sed 's!/usr/lib/!!' packaging/common/client-plugin.conf.example > \
-    %{buildroot}%{_sysconfdir}/%{name}/client.plugins.d/client-plugin.conf.example
-sed -e 's!/usr/lib64/!!' -e 's!-5!!' packaging/common/recorder.conf > \
+install -m 644 -p config/client.plugins.d/http.conf \
+    %{buildroot}%{_sysconfdir}/%{name}/client.plugins.d/http.conf
+install -m 644 -p config/client.plugins.d/recorder.conf \
     %{buildroot}%{_sysconfdir}/%{name}/client.plugins.d/recorder.conf
-sed 's!/usr/lib64/!!' packaging/common/http.client.conf.example > \
-    %{buildroot}%{_sysconfdir}/%{name}/client.plugins.d/xrdcl-http-plugin.conf
+install -m 644 -p config/client.plugins.d/s3.conf \
+    %{buildroot}%{_sysconfdir}/%{name}/client.plugins.d/s3.conf
 
 chmod 644 %{buildroot}%{_datadir}/%{name}/utils/XrdCmsNotify.pm
 
@@ -358,20 +370,21 @@ 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 \
+install -m 644 -p config/%{name}.logrotate \
     %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 
 mkdir -p %{buildroot}%{_datadir}/selinux/packages/%{name}
-install -m 644 -p packaging/common/%{name}.pp \
+install -m 644 -p config/%{name}.pp \
     %{buildroot}%{_datadir}/selinux/packages/%{name}
 
 # Documentation
 mkdir -p %{buildroot}%{_pkgdocdir}
 cp -pr doxydoc/html %{buildroot}%{_pkgdocdir}
 
-cp -pr bindings/python/docs/build/html %{buildroot}%{_pkgdocdir}/python
+cp -pr python/docs/build/html %{buildroot}%{_pkgdocdir}/python
 rm %{buildroot}%{_pkgdocdir}/python/.buildinfo
 
 %check
@@ -424,8 +437,6 @@ rm testfile
 %sysusers_create_compat %{SOURCE1}
 
 %post server
-%tmpfiles_create %{name}.conf
-
 if [ $1 -eq 1 ] ; then
     systemctl daemon-reload >/dev/null 2>&1 || :
 fi
@@ -488,7 +499,6 @@ fi
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/utils
 %{_unitdir}/*
-%{_tmpfilesdir}/%{name}.conf
 %{_sysusersdir}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %dir %{_sysconfdir}/%{name}/config.d
@@ -508,18 +518,18 @@ fi
 %{_libdir}/libXrdUtils.so.*
 %{_libdir}/libXrdXml.so.*
 # Plugins
-%{_libdir}/libXrdCksCalczcrc32-5.so
-%{_libdir}/libXrdCryptossl-5.so
-%{_libdir}/libXrdSec-5.so
-%{_libdir}/libXrdSecProt-5.so
-%{_libdir}/libXrdSecgsi-5.so
-%{_libdir}/libXrdSecgsiAUTHZVO-5.so
-%{_libdir}/libXrdSecgsiGMAPDN-5.so
-%{_libdir}/libXrdSeckrb5-5.so
-%{_libdir}/libXrdSecpwd-5.so
-%{_libdir}/libXrdSecsss-5.so
-%{_libdir}/libXrdSecunix-5.so
-%{_libdir}/libXrdSecztn-5.so
+%{_libdir}/libXrdCksCalczcrc32-6.so
+%{_libdir}/libXrdCryptossl-6.so
+%{_libdir}/libXrdSec-6.so
+%{_libdir}/libXrdSecProt-6.so
+%{_libdir}/libXrdSecgsi-6.so
+%{_libdir}/libXrdSecgsiAUTHZVO-6.so
+%{_libdir}/libXrdSecgsiGMAPDN-6.so
+%{_libdir}/libXrdSeckrb5-6.so
+%{_libdir}/libXrdSecpwd-6.so
+%{_libdir}/libXrdSecsss-6.so
+%{_libdir}/libXrdSecunix-6.so
+%{_libdir}/libXrdSecztn-6.so
 %license COPYING* LICENSE
 
 %files devel
@@ -554,16 +564,20 @@ fi
 %{_libdir}/libXrdSsiLib.so.*
 %{_libdir}/libXrdSsiShMap.so.*
 # Plugins
-%{_libdir}/libXrdClProxyPlugin-5.so
-%{_libdir}/libXrdClRecorder-5.so
+%{_libdir}/libXrdClHttp-6.so
+%{_libdir}/libXrdClProxyPlugin-6.so
+%{_libdir}/libXrdClRecorder-6.so
+%{_libdir}/libXrdClS3-6.so
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/client.conf
 %dir %{_sysconfdir}/%{name}/client.plugins.d
-%config(noreplace) %{_sysconfdir}/%{name}/client.plugins.d/client-plugin.conf.example
+%config(noreplace) %{_sysconfdir}/%{name}/client.plugins.d/http.conf
 %config(noreplace) %{_sysconfdir}/%{name}/client.plugins.d/recorder.conf
+%config(noreplace) %{_sysconfdir}/%{name}/client.plugins.d/s3.conf
 
 %files client-devel
 %{_includedir}/%{name}/XrdCl
+%{_includedir}/%{name}/XrdClHttp
 %{_includedir}/%{name}/XrdPosix
 %{_libdir}/libXrdCl.so
 %{_libdir}/libXrdFfs.so
@@ -573,26 +587,27 @@ fi
 %{_libdir}/libXrdHttpUtils.so.*
 %{_libdir}/libXrdServer.so.*
 # Plugins
-%{_libdir}/libXrdBlacklistDecision-5.so
-%{_libdir}/libXrdBwm-5.so
-%{_libdir}/libXrdCmsRedirectLocal-5.so
-%{_libdir}/libXrdFileCache-5.so
-%{_libdir}/libXrdHttp-5.so
-%{_libdir}/libXrdHttpCors-5.so
-%{_libdir}/libXrdHttpTPC-5.so
-%{_libdir}/libXrdMacaroons-5.so
-%{_libdir}/libXrdN2No2p-5.so
-%{_libdir}/libXrdOfsPrepGPI-5.so
-%{_libdir}/libXrdOssCsi-5.so
-%{_libdir}/libXrdOssSIgpfsT-5.so
-%{_libdir}/libXrdOssStats-5.so
-%{_libdir}/libXrdPfc-5.so
-%{_libdir}/libXrdPfcPurgeQuota-5.so
-%{_libdir}/libXrdPss-5.so
-%{_libdir}/libXrdSsi-5.so
-%{_libdir}/libXrdSsiLog-5.so
-%{_libdir}/libXrdThrottle-5.so
-%{_libdir}/libXrdXrootd-5.so
+%{_libdir}/libXrdBlacklistDecision-6.so
+%{_libdir}/libXrdBwm-6.so
+%{_libdir}/libXrdCmsRedirectLocal-6.so
+%{_libdir}/libXrdFileCache-6.so
+%{_libdir}/libXrdHttp-6.so
+%{_libdir}/libXrdHttpCors-6.so
+%{_libdir}/libXrdHttpTPC-6.so
+%{_libdir}/libXrdMacaroons-6.so
+%{_libdir}/libXrdN2No2p-6.so
+%{_libdir}/libXrdOfsPrepGPI-6.so
+%{_libdir}/libXrdOssArc-6.so
+%{_libdir}/libXrdOssCsi-6.so
+%{_libdir}/libXrdOssSIgpfsT-6.so
+%{_libdir}/libXrdOssStats-6.so
+%{_libdir}/libXrdPfc-6.so
+%{_libdir}/libXrdPfcPurgeQuota-6.so
+%{_libdir}/libXrdPss-6.so
+%{_libdir}/libXrdSsi-6.so
+%{_libdir}/libXrdSsiLog-6.so
+%{_libdir}/libXrdThrottle-6.so
+%{_libdir}/libXrdXrootd-6.so
 
 %files server-devel
 %{_includedir}/%{name}/XrdAcc
@@ -639,25 +654,21 @@ fi
 %{_mandir}/man1/xrootdfs.1*
 
 %files voms
-%{_libdir}/libXrdVoms-5.so
-%{_libdir}/libXrdHttpVOMS-5.so
-%{_libdir}/libXrdSecgsiVOMS-5.so
+%{_libdir}/libXrdVoms-6.so
+%{_libdir}/libXrdHttpVOMS-6.so
+%{_libdir}/libXrdSecgsiVOMS-6.so
 %doc %{_mandir}/man1/libXrdVoms.1*
 %doc %{_mandir}/man1/libXrdSecgsiVOMS.1*
 %doc src/XrdVoms/README.md
 
 %files scitokens
-%{_libdir}/libXrdAccSciTokens-5.so
+%{_libdir}/libXrdAccSciTokens-6.so
 %doc src/XrdSciTokens/README.md
 
-%files -n xrdcl-http
-%{_libdir}/libXrdClHttp-5.so
-%config(noreplace) %{_sysconfdir}/%{name}/client.plugins.d/xrdcl-http-plugin.conf
-
 %if %{ceph}
 %files ceph
-%{_libdir}/libXrdCeph-5.so
-%{_libdir}/libXrdCephXattr-5.so
+%{_libdir}/libXrdCeph-6.so
+%{_libdir}/libXrdCephXattr-6.so
 %{_libdir}/libXrdCephPosix.so.*
 %endif
 
@@ -670,6 +681,9 @@ fi
 %doc %{_pkgdocdir}
 
 %changelog
+* Sat Apr 11 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:6.0.0-1
+- Update to version 6.0.0
+
 * Fri Mar 27 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:5.9.2-1
 - Update to version 5.9.2
 - Drop patches accepted upstream or previously backported

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-11-22  9:05 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-22  9:05 [rpms/xrootd] epel8: Update to version 6.0.0 Mattias Ellert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox