diff --git a/0001-Bump-user-agent.patch b/0001-Bump-user-agent.patch new file mode 100644 index 0000000..878c2c8 --- /dev/null +++ b/0001-Bump-user-agent.patch @@ -0,0 +1,25 @@ +From 836f8d0ce7d058227e2d3f7d88842cb69f374bc0 Mon Sep 17 00:00:00 2001 +From: Matyas Selmeci +Date: Mon, 13 Jul 2026 14:43:11 -0500 +Subject: [PATCH] Bump user-agent + +--- + src/CurlUtil.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CurlUtil.cc b/src/CurlUtil.cc +index 8935dbd..39de3dd 100644 +--- a/src/CurlUtil.cc ++++ b/src/CurlUtil.cc +@@ -58,7 +58,7 @@ CURL *HandlerQueue::GetHandle() { + return result; + } + +- curl_easy_setopt(result, CURLOPT_USERAGENT, "xrootd-s3/0.6.8"); ++ curl_easy_setopt(result, CURLOPT_USERAGENT, "xrootd-s3/0.6.9"); + curl_easy_setopt(result, CURLOPT_BUFFERSIZE, 32 * 1024); + curl_easy_setopt(result, CURLOPT_NOSIGNAL, 1L); + +-- +2.55.0 + diff --git a/0001-Make-deadlock-test-setup-xrootd-version-agnostic.patch b/0001-Make-deadlock-test-setup-xrootd-version-agnostic.patch new file mode 100644 index 0000000..fe4c460 --- /dev/null +++ b/0001-Make-deadlock-test-setup-xrootd-version-agnostic.patch @@ -0,0 +1,42 @@ +From f54fe163943c7afa806580112b34e8211f3c0cec Mon Sep 17 00:00:00 2001 +From: Mattias Ellert +Date: Mon, 20 Jul 2026 01:57:21 +0200 +Subject: [PATCH] Make deadlock test setup xrootd version agnostic + +The current setup hardcodes version 5 and therefore fails on 6: + +------ Storage system initialization completed. +Config warning: osslib path '/builddir/build/BUILD/xrootd-s3-http-0.6.9-build/xrootd-s3-http-0.6.9/redhat-linux-build/libXrdOssDummyStall-5.so' should not use '-5' version syntax in its name! +Plugin osslib /builddir/build/BUILD/xrootd-s3-http-0.6.9-build/xrootd-s3-http-0.6.9/redhat-linux-build/libXrdOssDummyStall-5-6.so not found; falling back to using /builddir/build/BUILD/xrootd-s3-http-0.6.9-build/xrootd-s3-http-0.6.9/redhat-linux-build/libXrdOssDummyStall-5.so +Plugin No such file or directory loading osslib /builddir/build/BUILD/xrootd-s3-http-0.6.9-build/xrootd-s3-http-0.6.9/redhat-linux-build/libXrdOssDummyStall-5.so +--- + test/deadlock-setup.sh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/test/deadlock-setup.sh b/test/deadlock-setup.sh +index b9d00e0..591090a 100755 +--- a/test/deadlock-setup.sh ++++ b/test/deadlock-setup.sh +@@ -123,7 +123,7 @@ ofs.authorize 1 + acc.authdb $XROOTD_CONFIGDIR/authdb + # Stack the deadlock-detection authorization wrapper on top of the default + # authdb-based authorization. +-ofs.authlib ++ $BINARY_DIR/libXrdAccDeadlock-5.so ++ofs.authlib ++ $BINARY_DIR/libXrdAccDeadlock.so + + xrd.protocol XrdHttp:any libXrdHttp.so + http.header2cgi Authorization authz +@@ -133,8 +133,8 @@ xrd.tls $XROOTD_CONFIGDIR/tls.crt $XROOTD_CONFIGDIR/tls.key + + oss.localroot $XROOTD_EXPORTDIR + # OSS stack (innermost first): default OSS <- DummyStall <- Deadlock monitor. +-ofs.osslib ++ $BINARY_DIR/libXrdOssDummyStall-5.so +-ofs.osslib ++ $BINARY_DIR/libXrdOssDeadlock-5.so ++ofs.osslib ++ $BINARY_DIR/libXrdOssDummyStall.so ++ofs.osslib ++ $BINARY_DIR/libXrdOssDeadlock.so + + # Short timeout so the negative test does not have to wait long. + deadlock.timeout 3 +-- +2.55.0 + diff --git a/sources b/sources index 6cc010a..c34a9cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xrootd-s3-http-0.6.6.tar.gz) = 0596521a145b3d421f878b7f4a0802998e86c98b5b9d233e454adc9350769f6a63d6913b24f24c6648aacf4ca15e7f483b2d27d902c1afecff89f54bcc6876f4 +SHA512 (xrootd-s3-http-0.6.9.tar.gz) = 300e8bdf337fd78b461a0096b74e130ff8bbfbccd979090bc7af75de21f3245f809f04cee1d2af349c5c122bfe5e60d26f1dda34c0890c0fab16940f51bd8397 diff --git a/xrootd-s3-http.spec b/xrootd-s3-http.spec index f3f0cfe..6aee881 100644 --- a/xrootd-s3-http.spec +++ b/xrootd-s3-http.spec @@ -2,13 +2,17 @@ %undefine __cmake_in_source_build Name: xrootd-s3-http -Version: 0.6.6 +Version: 0.6.9 Release: 1%{?dist} Summary: S3/HTTP/Globus filesystem plugins for XRootD License: Apache-2.0 URL: https://github.com/PelicanPlatform/%{name} Source0: %{url}/archive/refs/tags/v%{version}/%{name}-%{version}.tar.gz +# Backport from git +Patch0: 0001-Bump-user-agent.patch +# https://github.com/PelicanPlatform/xrootd-s3-http/pull/160 +Patch1: 0001-Make-deadlock-test-setup-xrootd-version-agnostic.patch BuildRequires: cmake BuildRequires: gcc-c++ @@ -33,9 +37,18 @@ and HTTP backends through an XRootD server. %prep %setup -q +%patch -P0 -p1 +%patch -P1 -p1 +%if %{?rhel}%{!?rhel:0} == 8 # Drop json version requirement for EPEL 8 sed 's!nlohmann_json 3.11.2 QUIET!nlohmann_json QUIET!' -i CMakeLists.txt +%endif + +%if %{?rhel}%{!?rhel:0} == 8 || %{?rhel}%{!?rhel:0} == 9 +# Older gtest in EPEL 8 and 9 +sed /GTEST_FLAG_SET/d -i test/deadlock_tests.cc +%endif %build %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -53,20 +66,40 @@ sed 's!nlohmann_json 3.11.2 QUIET!nlohmann_json QUIET!' -i CMakeLists.txt %cmake_install rm %{buildroot}%{_libdir}/libXrdPelicanHttpCore.so +%global pver %(xrootd-config --plugin-version) + %files %{_libdir}/libXrdPelicanHttpCore.so.* -%{_libdir}/libXrdHTTPServer-5.so -%{_libdir}/libXrdN2NPrefix-5.so -%{_libdir}/libXrdOssFilter-5.so -%{_libdir}/libXrdOssGlobus-5.so -%{_libdir}/libXrdOssHttp-5.so -%{_libdir}/libXrdOssS3-5.so -%{_libdir}/libXrdOssPosc-5.so -%{_libdir}/libXrdS3-5.so +%{_libdir}/libXrdAccDeadlock-%{pver}.so +%{_libdir}/libXrdAccHttpCallout-%{pver}.so +%{_libdir}/libXrdHTTPServer-%{pver}.so +%{_libdir}/libXrdN2NPrefix-%{pver}.so +%{_libdir}/libXrdOssDeadlock-%{pver}.so +%{_libdir}/libXrdOssFilter-%{pver}.so +%{_libdir}/libXrdOssGlobus-%{pver}.so +%{_libdir}/libXrdOssHttp-%{pver}.so +%{_libdir}/libXrdOssS3-%{pver}.so +%{_libdir}/libXrdOssPosc-%{pver}.so +%{_libdir}/libXrdS3-%{pver}.so %doc README.md %license LICENSE %changelog +* Sun Jul 19 2026 Mattias Ellert - 0.6.9-1 +- Update to version 0.6.9 + +* Fri Jul 17 2026 Fedora Release Engineering - 0.6.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jun 20 2026 Mattias Ellert - 0.6.8-1 +- Update to version 0.6.8 + +* Sat Jun 13 2026 Yaakov Selkowitz - 0.6.6-3 +- Rebuilt for openssl 4.0 + +* Tue Apr 21 2026 Mattias Ellert - 0.6.6-2 +- Rebuilt for xrootd 6 + * Thu Apr 02 2026 Mattias Ellert - 0.6.6-1 - Update to version 0.6.6