diff --git a/xrootd-remove-debug-output.patch b/xrootd-remove-debug-output.patch new file mode 100644 index 0000000..917b3c9 --- /dev/null +++ b/xrootd-remove-debug-output.patch @@ -0,0 +1,47 @@ +From 7be1f28a5a2324af7e1890bf37a46913246ab1bf Mon Sep 17 00:00:00 2001 +From: Mattias Ellert +Date: Thu, 25 Feb 2021 23:05:18 +0100 +Subject: [PATCH] Remove debug output + +--- + src/XrdClHttp/Posix.cc | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/src/XrdClHttp/src/XrdClHttp/Posix.cc b/src/XrdClHttp/src/XrdClHttp/Posix.cc +index 4c47382..6b68ad0 100644 +--- a/src/XrdClHttp/src/XrdClHttp/Posix.cc ++++ b/src/XrdClHttp/src/XrdClHttp/Posix.cc +@@ -135,9 +135,6 @@ std::pair Open(Davix::DavPosix& davix_client, + SetTimeout(params, timeout); + SetX509(params); + Davix::DavixError* err = nullptr; +- +- printf("Posix::Open(%s)\n", url.c_str()); +- + DAVIX_FD* fd = davix_client.open(¶ms, url, flags, &err); + auto status = !fd ? XRootDStatus(stError, errInternal, err->getStatus(), + err->getErrMsg()) +@@ -299,8 +296,6 @@ XRootDStatus Stat(Davix::DavPosix& davix_client, const std::string& url, + SetTimeout(params, timeout); + SetX509(params); + +- printf("Posix::Stat(%s)\n", url.c_str()); +- + struct stat stats; + Davix::DavixError* err = nullptr; + if (davix_client.stat(¶ms, url, &stats, &err)) { +@@ -341,11 +336,9 @@ std::pair _PRead(Davix::DavPosix& davix_client, DAVIX_FD* fd, + Davix::DavixError* err = nullptr; + int num_bytes_read; + if (no_pread) { // continue reading from the current offset position +- printf("Posix::Read(size=%u)\n", size); + num_bytes_read = davix_client.read(fd, buffer, size, &err); + } + else { +- printf("Posix::PRead(size=%u, offset=%llu)\n", size, (unsigned long long)offset); + num_bytes_read = davix_client.pread(fd, buffer, size, offset, &err); + } + if (num_bytes_read < 0) { +-- +2.29.2 + diff --git a/xrootd.spec b/xrootd.spec index ddb91b3..691c970 100644 --- a/xrootd.spec +++ b/xrootd.spec @@ -19,7 +19,7 @@ Name: xrootd Epoch: 1 Version: 5.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Extended ROOT file server License: LGPLv3+ @@ -31,6 +31,9 @@ Patch0: %{name}-ceph-deps.patch # Fix format error on 32 bit architectures # https://github.com/xrootd/xrdcl-http/pull/7 Patch1: %{name}-32bit-format.patch +# Remove debug output +# https://github.com/xrootd/xrdcl-http/pull/7 +Patch2: %{name}-remove-debug-output.patch BuildRequires: gcc-c++ BuildRequires: cmake3 >= 3.1 @@ -284,6 +287,7 @@ This package contains the API documentation of the xrootd libraries. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %cmake3 \ @@ -647,6 +651,9 @@ fi %doc %{_pkgdocdir} %changelog +* Fri Feb 26 2021 Mattias Ellert - 1:5.1.0-2 +- Remove debug output + * Tue Feb 23 2021 Mattias Ellert - 1:5.1.0-1 - Update to version 5.1.0 - Add scitokens plugin package