public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Mattias Ellert <mattias.ellert@physics.uu.se>
To: git-commits@fedoraproject.org
Subject: [rpms/xrootd] epel8: Update to version 5.9.9
Date: Sat, 31 Oct 2026 13:34:22 GMT [thread overview]
Message-ID: <179345366201.1.16258723228769207302.rpms-xrootd-8a2fd12e6af8@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/xrootd
Branch : epel8
Commit : 8a2fd12e6af89dd3496c3f7dfa0fc2173642ca12
Author : Mattias Ellert <mattias.ellert@physics.uu.se>
Date : 2026-10-31T14:32:22+01:00
Stats : +9/-563 in 6 file(s)
URL : https://src.fedoraproject.org/rpms/xrootd/c/8a2fd12e6af89dd3496c3f7dfa0fc2173642ca12?branch=epel8
Log:
Update to version 5.9.9
Drop patches accepted upstream
---
diff --git a/0001-Python-Fix-parsing-of-enum-arguments-in-python-bindi.patch b/0001-Python-Fix-parsing-of-enum-arguments-in-python-bindi.patch
deleted file mode 100644
index d3afd79..0000000
--- a/0001-Python-Fix-parsing-of-enum-arguments-in-python-bindi.patch
+++ /dev/null
@@ -1,243 +0,0 @@
-From d4005e057943ad73e831b26300151f628ec5fb51 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Sat, 3 Oct 2026 23:51:59 +0200
-Subject: [PATCH 1/4] [Python] Fix parsing of enum arguments in python bindings
-
-The underlying type of an enum is not mandated by the C++ standard, so
-which format character to use when parsing an enum argument in the
-python bindings is not obvious. The code used 'H' (unsigned short int)
-for most of them. This does not match what is actually used by gcc -
-which is a 32 bit integer. For a little endian architecture it does
-not matter to much as long as the value fits in the 16 bit range since
-ignoring the last bytes in a little endian representation doesn't
-matter if the value is small enough (which is true for most enum
-values). However, for big endian architecture getting the size of the
-underlyimh type wrong results in parsing completely wrong values.
-
-This commit parses all enum arguments as 'I' (unsigned int) using a
-temporary unsigned int variable which is then cast to the enum type.
-
-This is a backport of the corresponding fix in XRootD 6.
----
- bindings/python/src/PyXRootDFile.cc | 17 +++--
- bindings/python/src/PyXRootDFileSystem.cc | 90 +++++++++++++++--------
- 2 files changed, 73 insertions(+), 34 deletions(-)
-
-diff --git a/bindings/python/src/PyXRootDFile.cc b/bindings/python/src/PyXRootDFile.cc
-index 74faea96a..ef0f31d1e 100644
---- a/bindings/python/src/PyXRootDFile.cc
-+++ b/bindings/python/src/PyXRootDFile.cc
-@@ -40,17 +40,24 @@ namespace PyXRootD
- {
- static const char *kwlist[] = { "url", "flags", "mode",
- "timeout", "callback", NULL };
-- const char *url;
-- XrdCl::OpenFlags::Flags flags = XrdCl::OpenFlags::None;
-- XrdCl::Access::Mode mode = XrdCl::Access::None;
-+ const char *url;
-+ unsigned int flags_val =
-+ static_cast<unsigned int>(XrdCl::OpenFlags::None);
-+ unsigned int mode_val =
-+ static_cast<unsigned int>(XrdCl::Access::None);
- uint16_t timeout = 0;
- PyObject *callback = NULL, *pystatus = NULL;
- XrdCl::XRootDStatus status;
-
-- if ( !PyArg_ParseTupleAndKeywords( args, kwds, "s|HHHO:open",
-- (char**) kwlist, &url, &flags, &mode, &timeout, &callback ) )
-+ if ( !PyArg_ParseTupleAndKeywords( args, kwds, "s|IIHO:open",
-+ (char**) kwlist, &url, &flags_val, &mode_val, &timeout, &callback ) )
- return NULL;
-
-+ XrdCl::OpenFlags::Flags flags =
-+ static_cast<XrdCl::OpenFlags::Flags>(flags_val);
-+ XrdCl::Access::Mode mode =
-+ static_cast<XrdCl::Access::Mode>(mode_val);
-+
- if ( callback && callback != Py_None ) {
- XrdCl::ResponseHandler *handler = GetHandler<XrdCl::AnyObject>( callback );
- if ( !handler ) return NULL;
-diff --git a/bindings/python/src/PyXRootDFileSystem.cc b/bindings/python/src/PyXRootDFileSystem.cc
-index a21148328..c507e6b4e 100644
---- a/bindings/python/src/PyXRootDFileSystem.cc
-+++ b/bindings/python/src/PyXRootDFileSystem.cc
-@@ -82,14 +82,19 @@ namespace PyXRootD
- {
- static const char *kwlist[] = { "path", "flags", "timeout", "callback",
- NULL };
-- const char *path;
-- XrdCl::OpenFlags::Flags flags = XrdCl::OpenFlags::None;
-+ const char *path;
-+ unsigned int flags_val =
-+ static_cast<unsigned int>(XrdCl::OpenFlags::None);
- uint16_t timeout = 0;
- PyObject *callback = NULL, *pyresponse = NULL, *pystatus = NULL;
- XrdCl::XRootDStatus status;
-
-- if ( !PyArg_ParseTupleAndKeywords( args, kwds, "sH|HO:locate",
-- (char**) kwlist, &path, &flags, &timeout, &callback ) ) return NULL;
-+ if ( !PyArg_ParseTupleAndKeywords( args, kwds, "sI|HO:locate",
-+ (char**) kwlist, &path, &flags_val, &timeout, &callback ) )
-+ return NULL;
-+
-+ XrdCl::OpenFlags::Flags flags =
-+ static_cast<XrdCl::OpenFlags::Flags>(flags_val);
-
- if ( callback && callback != Py_None ) {
- XrdCl::ResponseHandler *handler = GetHandler<XrdCl::LocationInfo>( callback );
-@@ -120,14 +125,19 @@ namespace PyXRootD
- {
- static const char *kwlist[] = { "path", "flags", "timeout", "callback",
- NULL };
-- const char *path;
-- XrdCl::OpenFlags::Flags flags = XrdCl::OpenFlags::PrefName;
-+ const char *path;
-+ unsigned int flags_val =
-+ static_cast<unsigned int>(XrdCl::OpenFlags::PrefName);
- uint16_t timeout = 0;
- PyObject *callback = NULL, *pyresponse = NULL, *pystatus = NULL;
- XrdCl::XRootDStatus status;
-
-- if ( !PyArg_ParseTupleAndKeywords( args, kwds, "sH|HO:deeplocate",
-- (char**) kwlist, &path, &flags, &timeout, &callback ) ) return NULL;
-+ if ( !PyArg_ParseTupleAndKeywords( args, kwds, "sI|HO:deeplocate",
-+ (char**) kwlist, &path, &flags_val, &timeout, &callback ) )
-+ return NULL;
-+
-+ XrdCl::OpenFlags::Flags flags =
-+ static_cast<XrdCl::OpenFlags::Flags>(flags_val);
-
- if ( callback && callback != Py_None ) {
- XrdCl::ResponseHandler *handler = GetHandler<XrdCl::LocationInfo>( callback );
-@@ -192,15 +202,19 @@ namespace PyXRootD
- {
- static const char *kwlist[] = { "querycode", "arg", "timeout",
- "callback", NULL };
-- const char *arg;
-+ unsigned int queryCode_val;
-+ const char *arg;
- uint16_t timeout = 0;
- PyObject *callback = NULL, *pyresponse = NULL, *pystatus = NULL;
-- XrdCl::QueryCode::Code queryCode;
- XrdCl::XRootDStatus status;
- XrdCl::Buffer argbuffer;
-
-- if ( !PyArg_ParseTupleAndKeywords( args, kwds, "is|HO:query",
-- (char**) kwlist, &queryCode, &arg, &timeout, &callback ) ) return NULL;
-+ if ( !PyArg_ParseTupleAndKeywords( args, kwds, "Is|HO:query",
-+ (char**) kwlist, &queryCode_val, &arg, &timeout, &callback ) )
-+ return NULL;
-+
-+ XrdCl::QueryCode::Code queryCode =
-+ static_cast<XrdCl::QueryCode::Code>(queryCode_val);
-
- argbuffer.FromString(arg);
-
-@@ -298,15 +312,23 @@ namespace PyXRootD
- {
- static const char *kwlist[] = { "path", "flags", "mode", "timeout",
- "callback", NULL };
-- const char *path;
-- XrdCl::MkDirFlags::Flags flags = XrdCl::MkDirFlags::None;
-- XrdCl::Access::Mode mode = XrdCl::Access::None;
-+ const char *path;
-+ unsigned int flags_val =
-+ static_cast<unsigned int>(XrdCl::MkDirFlags::None);
-+ unsigned int mode_val =
-+ static_cast<unsigned int>(XrdCl::Access::None);
- uint16_t timeout = 0;
- PyObject *callback = NULL, *pystatus = NULL;
- XrdCl::XRootDStatus status;
-
-- if ( !PyArg_ParseTupleAndKeywords( args, kwds, "s|HHHO:mkdir", (char**) kwlist,
-- &path, &flags, &mode, &timeout, &callback ) ) return NULL;
-+ if ( !PyArg_ParseTupleAndKeywords( args, kwds, "s|IIHO:mkdir",
-+ (char**) kwlist, &path, &flags_val, &mode_val, &timeout, &callback ) )
-+ return NULL;
-+
-+ XrdCl::MkDirFlags::Flags flags =
-+ static_cast<XrdCl::MkDirFlags::Flags>(flags_val);
-+ XrdCl::Access::Mode mode =
-+ static_cast<XrdCl::Access::Mode>(mode_val);
-
- if ( callback && callback != Py_None ) {
- XrdCl::ResponseHandler *handler = GetHandler<XrdCl::AnyObject>( callback );
-@@ -365,13 +387,18 @@ namespace PyXRootD
- {
- static const char *kwlist[] = { "path", "mode", "timeout", "callback", NULL };
- const char *path;
-- XrdCl::Access::Mode mode = XrdCl::Access::None;
-+ unsigned int mode_val =
-+ static_cast<unsigned int>(XrdCl::Access::None);
- uint16_t timeout = 0;
- PyObject *callback = NULL, *pystatus = NULL;
- XrdCl::XRootDStatus status;
-
-- if ( !PyArg_ParseTupleAndKeywords( args, kwds, "sH|HO:chmod", (char**) kwlist,
-- &path, &mode, &timeout, &callback ) ) return NULL;
-+ if ( !PyArg_ParseTupleAndKeywords( args, kwds, "sI|HO:chmod",
-+ (char**) kwlist, &path, &mode_val, &timeout, &callback ) )
-+ return NULL;
-+
-+ XrdCl::Access::Mode mode =
-+ static_cast<XrdCl::Access::Mode>(mode_val);
-
- if ( callback && callback != Py_None ) {
- XrdCl::ResponseHandler *handler = GetHandler<XrdCl::AnyObject>( callback );
-@@ -536,14 +563,19 @@ namespace PyXRootD
- {
- static const char *kwlist[] = { "path", "flags", "timeout",
- "callback", NULL };
-- const char *path;
-- XrdCl::DirListFlags::Flags flags = XrdCl::DirListFlags::None;
-+ const char *path;
-+ unsigned int flags_val =
-+ static_cast<unsigned int>(XrdCl::DirListFlags::None);
- uint16_t timeout = 0;
- PyObject *callback = NULL, *pyresponse = NULL, *pystatus = NULL;
- XrdCl::XRootDStatus status;
-
-- if ( !PyArg_ParseTupleAndKeywords( args, kwds, "s|bHO:dirlist",
-- (char**) kwlist, &path, &flags, &timeout, &callback ) ) return NULL;
-+ if ( !PyArg_ParseTupleAndKeywords( args, kwds, "s|IHO:dirlist",
-+ (char**) kwlist, &path, &flags_val, &timeout, &callback ) )
-+ return NULL;
-+
-+ XrdCl::DirListFlags::Flags flags =
-+ static_cast<XrdCl::DirListFlags::Flags>(flags_val);
-
- if ( callback && callback != Py_None ) {
- XrdCl::ResponseHandler *handler = GetHandler<XrdCl::DirectoryList>( callback );
-@@ -610,15 +642,15 @@ namespace PyXRootD
- {
- static const char *kwlist[] = { "files", "flags", "priority",
- "timeout", "callback", NULL };
-- uint16_t flagval = 0;
-+ unsigned int flags_val = 0;
- uint8_t priority = 0;
- uint16_t timeout = 0;
- PyObject *pyfiles = NULL, *callback = NULL;
- PyObject *pyresponse = NULL, *pystatus = NULL;
- XrdCl::XRootDStatus status;
-
-- if ( !PyArg_ParseTupleAndKeywords( args, kwds, "OH|bHO:prepare",
-- (char**) kwlist, &pyfiles, &flagval, &priority, &timeout, &callback ) )
-+ if ( !PyArg_ParseTupleAndKeywords( args, kwds, "OI|bHO:prepare",
-+ (char**) kwlist, &pyfiles, &flags_val, &priority, &timeout, &callback ) )
- return NULL;
-
- if ( !PyList_Check( pyfiles ) ) {
-@@ -639,8 +671,8 @@ namespace PyXRootD
- files.emplace_back(PyUnicode_AsUTF8(item));
- }
-
-- XrdCl::PrepareFlags::Flags flags;
-- flags = static_cast<XrdCl::PrepareFlags::Flags>(flagval);
-+ XrdCl::PrepareFlags::Flags flags =
-+ static_cast<XrdCl::PrepareFlags::Flags>(flags_val);
-
- if ( callback && callback != Py_None ) {
- XrdCl::ResponseHandler *handler = GetHandler<XrdCl::Buffer>( callback );
---
-2.56.0
-
diff --git a/0002-Python-Fix-parsing-of-uint64_t-arguments-in-python-b.patch b/0002-Python-Fix-parsing-of-uint64_t-arguments-in-python-b.patch
deleted file mode 100644
index 64cc78c..0000000
--- a/0002-Python-Fix-parsing-of-uint64_t-arguments-in-python-b.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 94a19d0e7bf3c378c67eb18a6fb51d4428234e82 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Tue, 6 Oct 2026 08:13:49 +0200
-Subject: [PATCH 2/4] [Python] Fix parsing of uint64_t arguments in python
- bindings
-
-Previously the format "k" (unsigned long) was used for parsing
-uint64_t values. This is not correct on 32 bit architectures where
-unsigned long is 32 bits wide. This commit uses format "K" (unsigned
-long long) which is 64 bits wide on both 32 and 64 bit architectures.
-
-This is a backport of the corresponding fix in XRootD 6.
----
- bindings/python/src/Conversions.hh | 25 ++++++++++++++++---------
- bindings/python/src/PyXRootDFile.cc | 18 +++++++-----------
- 2 files changed, 23 insertions(+), 20 deletions(-)
-
-diff --git a/bindings/python/src/Conversions.hh b/bindings/python/src/Conversions.hh
-index 5c52ab28e..629bb0a79 100644
---- a/bindings/python/src/Conversions.hh
-+++ b/bindings/python/src/Conversions.hh
-@@ -127,9 +127,11 @@ namespace PyXRootD
- {
- return Py_BuildValue("{sNsNsNsNsN}",
- "id", Py_BuildValue("s", info->GetId().c_str()),
-- "size", Py_BuildValue("k", info->GetSize()),
-+ "size", Py_BuildValue("K",
-+ static_cast<unsigned long long>(info->GetSize())),
- "flags", Py_BuildValue("I", info->GetFlags()),
-- "modtime", Py_BuildValue("k", info->GetModTime()),
-+ "modtime", Py_BuildValue("K",
-+ static_cast<unsigned long long>(info->GetModTime())),
- "modtimestr", Py_BuildValue("s",
- info->GetModTimeAsString().c_str()));
- }
-@@ -139,11 +141,15 @@ namespace PyXRootD
- {
- static PyObject* Convert( XrdCl::StatInfoVFS *info )
- {
-- return Py_BuildValue( "{sksksksksbsb}",
-- "nodes_rw", info->GetNodesRW(),
-- "nodes_staging", info->GetNodesStaging(),
-- "free_rw", info->GetFreeRW(),
-- "free_staging", info->GetFreeStaging(),
-+ return Py_BuildValue( "{sKsKsKsKsbsb}",
-+ "nodes_rw",
-+ static_cast<unsigned long long>(info->GetNodesRW()),
-+ "nodes_staging",
-+ static_cast<unsigned long long>(info->GetNodesStaging()),
-+ "free_rw",
-+ static_cast<unsigned long long>(info->GetFreeRW()),
-+ "free_staging",
-+ static_cast<unsigned long long>(info->GetFreeStaging()),
- "utilization_rw", info->GetUtilizationRW(),
- "utilization_staging", info->GetUtilizationStaging() );
- }
-@@ -275,7 +281,8 @@ namespace PyXRootD
-
- PyList_SET_ITEM( pychunks, i,
- Py_BuildValue( "{sNsNsO}",
-- "offset", Py_BuildValue( "k", chunk.offset ),
-+ "offset", Py_BuildValue( "K",
-+ static_cast<unsigned long long>(chunk.offset) ),
- "length", Py_BuildValue( "I", chunk.length ),
- "buffer", buffer ) );
- Py_DECREF( buffer );
-@@ -323,7 +330,7 @@ namespace PyXRootD
- key = "size";
- if(result->HasProperty(key))
- {
-- uint64_t s;
-+ unsigned long long s;
- result->Get(key, s);
- kO = Py_BuildValue("s", key);
- vO = Py_BuildValue("K", s);
-diff --git a/bindings/python/src/PyXRootDFile.cc b/bindings/python/src/PyXRootDFile.cc
-index ef0f31d1e..ded9edd3d 100644
---- a/bindings/python/src/PyXRootDFile.cc
-+++ b/bindings/python/src/PyXRootDFile.cc
-@@ -325,8 +325,8 @@ namespace PyXRootD
-
- if ( !self->file->IsOpen() ) return FileClosedError();
-
-- if ( !PyArg_ParseTupleAndKeywords( args, kwds, "|kII:readlines",
-- (char**) kwlist, &offset, &size, &chunksize ) ) return NULL;
-+ if ( !PyArg_ParseTupleAndKeywords( args, kwds, "|OOO:readlines",
-+ (char**) kwlist, &py_offset, &py_size, &py_chunksize ) ) return NULL;
-
- unsigned long long tmp_offset = 0;
- unsigned int tmp_size = 0, tmp_chunksize = 0;
-@@ -387,8 +387,6 @@ namespace PyXRootD
- PyObject* File::ReadChunks( File *self, PyObject *args, PyObject *kwds )
- {
- static const char *kwlist[] = { "offset", "chunksize", NULL };
-- uint64_t offset = 0;
-- uint32_t chunksize = 0;
- ChunkIterator *iterator;
- PyObject *py_offset = NULL, *py_chunksize = NULL;
-
-@@ -397,22 +395,20 @@ namespace PyXRootD
- if ( !PyArg_ParseTupleAndKeywords( args, kwds, "|OO:readchunks",
- (char**) kwlist, &py_offset, &py_chunksize ) ) return NULL;
-
-- unsigned long long tmp_offset = 0;
-- unsigned int tmp_chunksize = 1024 * 1024 *2; // 2 MB
-+ unsigned long long offset = 0;
-+ unsigned int chunksize = 1024 * 1024 *2; // 2 MB
-
-- if ( py_offset && PyObjToUllong( py_offset, &tmp_offset, "offset" ) )
-+ if ( py_offset && PyObjToUllong( py_offset, &offset, "offset" ) )
- return NULL;
-
-- if ( py_chunksize && PyObjToUint( py_chunksize, &tmp_chunksize, "chunksize" ) )
-+ if ( py_chunksize && PyObjToUint( py_chunksize, &chunksize, "chunksize" ) )
- return NULL;
-
-- offset = (uint64_t)tmp_offset;
-- chunksize = (uint32_t)tmp_chunksize;
- ChunkIteratorType.tp_new = PyType_GenericNew;
-
- if ( PyType_Ready( &ChunkIteratorType ) < 0 ) return NULL;
-
-- args = Py_BuildValue( "ONN", self, Py_BuildValue("k", offset),
-+ args = Py_BuildValue( "ONN", self, Py_BuildValue("K", offset),
- Py_BuildValue("I", chunksize) );
- iterator = (ChunkIterator*)
- PyObject_CallObject( (PyObject *) &ChunkIteratorType, args );
---
-2.56.0
-
diff --git a/0003-Python-Fix-parsing-of-bool-argument-in-python-bindin.patch b/0003-Python-Fix-parsing-of-bool-argument-in-python-bindin.patch
deleted file mode 100644
index c7e8a1b..0000000
--- a/0003-Python-Fix-parsing-of-bool-argument-in-python-bindin.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4afcc26be18c93c6081a7b1fb7e1fd0fd3840b0b Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Thu, 8 Oct 2026 19:29:25 +0200
-Subject: [PATCH 3/4] [Python] Fix parsing of bool argument in python bindings
-
-Boolean values should use the "b" format. This is a backport of the
-corresponding fix in XRootD 6.
----
- bindings/python/src/PyXRootDFileSystem.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bindings/python/src/PyXRootDFileSystem.cc b/bindings/python/src/PyXRootDFileSystem.cc
-index c507e6b4e..dd346de39 100644
---- a/bindings/python/src/PyXRootDFileSystem.cc
-+++ b/bindings/python/src/PyXRootDFileSystem.cc
-@@ -44,7 +44,7 @@ namespace PyXRootD
- PyObject *pystatus = NULL;
- CopyProcess *copyprocess = NULL;
-
-- if ( !PyArg_ParseTupleAndKeywords( args, kwds, "ss|i:copy",
-+ if ( !PyArg_ParseTupleAndKeywords( args, kwds, "ss|b:copy",
- (char**) kwlist, &source, &target, &force ) ) return NULL;
-
- CopyProcessType.tp_new = PyType_GenericNew;
---
-2.56.0
-
diff --git a/0004-Python-Update-converter-helper-functions.patch b/0004-Python-Update-converter-helper-functions.patch
deleted file mode 100644
index 0e0e72f..0000000
--- a/0004-Python-Update-converter-helper-functions.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From 550c9bfea80abc0db8928ff8638ebad31a7e1181 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert@physics.uu.se>
-Date: Fri, 9 Oct 2026 10:52:31 +0200
-Subject: [PATCH 4/4] [Python] Update converter helper functions
-
-The converter for an unsigned long long passed the value through a
-temporary unsigned long, loosing range on 32 bit architectures.
-
-This is a backport of the corresponding fix in XRootD 6.
----
- bindings/python/src/Utils.cc | 53 ++++--------------------------------
- bindings/python/src/Utils.hh | 15 ++--------
- 2 files changed, 8 insertions(+), 60 deletions(-)
-
-diff --git a/bindings/python/src/Utils.cc b/bindings/python/src/Utils.cc
-index 0d4ba52d8..9d22b3074 100644
---- a/bindings/python/src/Utils.cc
-+++ b/bindings/python/src/Utils.cc
-@@ -55,38 +55,10 @@ namespace PyXRootD
- }
-
- //----------------------------------------------------------------------------
-- // Convert PyInt to unsigned long (uint64_t)
-- //----------------------------------------------------------------------------
-- int PyIntToUlong(PyObject *py_val, unsigned long *val, const char *name)
-- {
-- const long tmp = PyLong_AsLong(py_val);
--
-- if (tmp == -1 && PyErr_Occurred())
-- {
-- if (PyErr_ExceptionMatches(PyExc_OverflowError))
-- PyErr_Format(PyExc_OverflowError, "%s too big for unsigned long", name);
-- return -1;
-- }
--
-- if (tmp < 0)
-- {
-- PyErr_Format(PyExc_OverflowError,
-- "negative %s cannot be converted to unsigned long", name);
-- return -1;
-- }
--
-- *val = tmp;
-- return 0;
-- }
--
-- //----------------------------------------------------------------------------
-- // Convert Python object to unsigned long (uint64_t)
-+ // Convert Python object to unsigned long
- //----------------------------------------------------------------------------
- int PyObjToUlong(PyObject *py_val, unsigned long *val, const char *name)
- {
-- if (PyLong_Check(py_val))
-- return PyIntToUlong(py_val, val, name);
--
- if (!PyLong_Check(py_val))
- {
- PyErr_Format(PyExc_TypeError, "expected integer %s", name);
-@@ -95,7 +67,7 @@ namespace PyXRootD
-
- const unsigned long tmp = PyLong_AsUnsignedLong(py_val);
-
-- if (PyErr_Occurred())
-+ if ((tmp == (unsigned long) -1) && PyErr_Occurred())
- {
- if (PyErr_ExceptionMatches(PyExc_OverflowError))
- PyErr_Format(PyExc_OverflowError, "%s too big for unsigned long", name);
-@@ -132,9 +104,9 @@ namespace PyXRootD
- //----------------------------------------------------------------------------
- int PyObjToUshrt(PyObject *py_val, unsigned short int *val, const char *name)
- {
-- unsigned int tmp;
-+ unsigned long tmp;
-
-- if (PyObjToUint(py_val, &tmp, name))
-+ if (PyObjToUlong(py_val, &tmp, name))
- return -1;
-
- if (tmp > USHRT_MAX)
-@@ -151,29 +123,16 @@ namespace PyXRootD
- //----------------------------------------------------------------------------
- // Convert Python object to unsigned long long (uint64_t)
- //----------------------------------------------------------------------------
-- int PyObjToUllong(PyObject *py_val, unsigned PY_LONG_LONG *val,
-+ int PyObjToUllong(PyObject *py_val, unsigned long long *val,
- const char *name)
- {
-- if (PyLong_Check(py_val))
-- {
-- unsigned long tmp;
--
-- if (!PyIntToUlong(py_val, &tmp, name))
-- {
-- *val = tmp;
-- return 0;
-- }
--
-- return -1;
-- }
--
- if (!PyLong_Check(py_val))
- {
- PyErr_Format(PyExc_TypeError, "integer argument expected for %s", name);
- return -1;
- }
-
-- const unsigned PY_LONG_LONG tmp = PyLong_AsUnsignedLongLong(py_val);
-+ const unsigned long long tmp = PyLong_AsUnsignedLongLong(py_val);
-
- if ((tmp == (unsigned long long) -1) && PyErr_Occurred())
- {
-diff --git a/bindings/python/src/Utils.hh b/bindings/python/src/Utils.hh
-index c8df4e055..bcf084e56 100644
---- a/bindings/python/src/Utils.hh
-+++ b/bindings/python/src/Utils.hh
-@@ -42,18 +42,7 @@ namespace PyXRootD
- int InitTypes();
-
- //----------------------------------------------------------------------------
-- //! Convert PyInt to unsigned long (uint64_t)
-- //!
-- //! @param py_val python object to be converted
-- //! @param val converted value
-- //! @param name name of the object
-- //!
-- //! return 0 if successful, otherwise failed
-- //----------------------------------------------------------------------------
-- int PyIntToUlong(PyObject *py_val, unsigned long *val, const char *name);
--
-- //----------------------------------------------------------------------------
-- //! Convert Python object to unsigned long (uint64_t)
-+ //! Convert Python object to unsigned long
- //!
- //! @param py_val python object to be converted
- //! @param val converted value
-@@ -94,7 +83,7 @@ namespace PyXRootD
- //!
- //! return 0 if successful, otherwise failed
- //----------------------------------------------------------------------------
-- int PyObjToUllong(PyObject *py_val, unsigned PY_LONG_LONG *val, const char *name);
-+ int PyObjToUllong(PyObject *py_val, unsigned long long *val, const char *name);
- }
-
- #endif /* UTILS_HH_ */
---
-2.56.0
-
diff --git a/sources b/sources
index 16c3ed2..0c281c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xrootd-5.9.8.tar.gz) = ff6e4f4e8ea4bfba5770717280051d30fe55347c3c03010a80503d5d40a408fb09d50a5b16ed66001c7765a84ea3a9499f108907c442ed1bb24193a0279d6e21
+SHA512 (xrootd-5.9.9.tar.gz) = 14ebe643f21e01065f40d02d370efa8832b81ce9f682d83ec79093daee88cba0bd3e14ad0038d8bbbb95b3ea457c3fbd972c895aafd0d3a9096814a98ac157f0
diff --git a/xrootd.spec b/xrootd.spec
index b5166bd..e95b855 100644
--- a/xrootd.spec
+++ b/xrootd.spec
@@ -13,20 +13,14 @@
Name: xrootd
Epoch: 1
-Version: 5.9.8
-Release: 2%{?dist}
+Version: 5.9.9
+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
-URL: https://xrootd.web.cern.ch
-Source0: %{url}/download/v%{version}/%{name}-%{version}.tar.gz
+URL: https://xrootd.org
+Source0: https://xrootd.web.cern.ch/download/v%{version}/%{name}-%{version}.tar.gz
Source1: %{name}-sysusers.conf
-# https://github.com/xrootd/xrootd/pull/2971
-Patch0: 0001-Python-Fix-parsing-of-enum-arguments-in-python-bindi.patch
-Patch1: 0002-Python-Fix-parsing-of-uint64_t-arguments-in-python-b.patch
-Patch2: 0003-Python-Fix-parsing-of-bool-argument-in-python-bindin.patch
-Patch3: 0004-Python-Update-converter-helper-functions.patch
-
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: make
@@ -274,11 +268,6 @@ 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
-
# Delete bundled dependencies
rm src/XrdXml/tinyxml/tiny*
%if %{?fedora}%{!?fedora:0}
@@ -680,6 +669,10 @@ fi
%doc %{_pkgdocdir}
%changelog
+* Sat Oct 31 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:5.9.9-1
+- Update to version 5.9.9
+- Drop patches accepted upstream
+
* Sun Oct 11 2026 Mattias Ellert <mattias.ellert@physics.uu.se> - 1:5.9.8-2
- Some fixes for the python bindings
reply other threads:[~2026-10-31 13:34 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=179345366201.1.16258723228769207302.rpms-xrootd-8a2fd12e6af8@fedoraproject.org \
--to=mattias.ellert@physics.uu.se \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox