diff --git a/dmlite-xrootd4-revert.patch b/dmlite-xrootd4-revert.patch new file mode 100644 index 0000000..5ccd42f --- /dev/null +++ b/dmlite-xrootd4-revert.patch @@ -0,0 +1,80 @@ +diff -NPurBb dmlite-1.14.2.el7/src/dome/CMakeLists.txt dmlite-1.14.2.el6/src/dome/CMakeLists.txt +--- dmlite-1.14.2.el7/src/dome/CMakeLists.txt 2020-11-02 10:20:22.000000000 +0100 ++++ dmlite-1.14.2.el6/src/dome/CMakeLists.txt 2020-11-05 12:25:07.000000000 +0100 +@@ -22,15 +22,15 @@ + include_directories(${DAVIX_PKG_INCLUDE_DIRS}) + + set ( CMAKE_CXX_FLAGS "-Wall ${CMAKE_CXX_FLAGS}" ) +-add_library (dome-5 SHARED ${Dome_SOURCES} ${DMLITE_UTILS_SOURCES} ${DMLITE_DAVIX_POOL_SOURCES}) +-target_link_libraries (dome-5 ${XROOTD_LIBRARIES} ${XROOTD_LIBRARIES_HTTP} ${DAVIX_PKG_LIBRARIES} ${MYSQL_LIBRARIES} ${Boost_LIBRARIES} crypto dmlite pthread dl) ++add_library (dome-4 SHARED ${Dome_SOURCES} ${DMLITE_UTILS_SOURCES} ${DMLITE_DAVIX_POOL_SOURCES}) ++target_link_libraries (dome-4 ${XROOTD_LIBRARIES} ${XROOTD_LIBRARIES_HTTP} ${DAVIX_PKG_LIBRARIES} ${MYSQL_LIBRARIES} ${Boost_LIBRARIES} crypto dmlite pthread dl) + + + add_executable (dome-checksum DomeChecksum.cpp) + target_link_libraries (dome-checksum z crypto ssl ${DAVIX_PKG_LIBRARIES}) + + # Install +-install (TARGETS dome-5 ++install (TARGETS dome-4 + DESTINATION ${INSTALL_PFX_LIB} + PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ + GROUP_EXECUTE GROUP_READ +diff -NPurBb dmlite-1.14.2.el7/src/plugins/dpm-xrootd/src/CMakeLists.txt dmlite-1.14.2.el6/src/plugins/dpm-xrootd/src/CMakeLists.txt +--- dmlite-1.14.2.el7/src/plugins/dpm-xrootd/src/CMakeLists.txt 2020-11-02 10:20:22.000000000 +0100 ++++ dmlite-1.14.2.el6/src/plugins/dpm-xrootd/src/CMakeLists.txt 2020-11-05 12:25:07.000000000 +0100 +@@ -12,41 +12,41 @@ + # + # the Finder library + # +-add_library(XrdDPMFinder-5 SHARED XrdDPMFinder.cc XrdDPMFinderConfig.cc XrdDPMCommon.cc) +-target_link_libraries(XrdDPMFinder-5 dmlite ${XROOTD_LIBRARIES} ${OPENSSL_LIBRARIES}) ++add_library(XrdDPMFinder-4 SHARED XrdDPMFinder.cc XrdDPMFinderConfig.cc XrdDPMCommon.cc) ++target_link_libraries(XrdDPMFinder-4 dmlite ${XROOTD_LIBRARIES} ${OPENSSL_LIBRARIES}) + + # + # the Oss library + # +-add_library(XrdDPMOss-5 SHARED XrdDPMOss.cc XrdDPMCommon.cc) +-target_link_libraries(XrdDPMOss-5 dmlite ${XROOTD_LIBRARIES} ${OPENSSL_LIBRARIES}) ++add_library(XrdDPMOss-4 SHARED XrdDPMOss.cc XrdDPMCommon.cc) ++target_link_libraries(XrdDPMOss-4 dmlite ${XROOTD_LIBRARIES} ${OPENSSL_LIBRARIES}) + + # + # the Acc library for the disk server + # +-add_library(XrdDPMDiskAcc-5 SHARED XrdDPMDiskAcc.cc XrdDPMCommon.cc) +-target_link_libraries(XrdDPMDiskAcc-5 dmlite ${XROOTD_LIBRARIES} ${OPENSSL_LIBRARIES}) ++add_library(XrdDPMDiskAcc-4 SHARED XrdDPMDiskAcc.cc XrdDPMCommon.cc) ++target_link_libraries(XrdDPMDiskAcc-4 dmlite ${XROOTD_LIBRARIES} ${OPENSSL_LIBRARIES}) + + # + # the Acc library for the redirector + # +-add_library(XrdDPMRedirAcc-5 SHARED XrdDPMRedirAcc.cc XrdDPMCommon.cc) +-target_link_libraries(XrdDPMRedirAcc-5 dmlite ${XROOTD_LIBRARIES} ${OPENSSL_LIBRARIES}) ++add_library(XrdDPMRedirAcc-4 SHARED XrdDPMRedirAcc.cc XrdDPMCommon.cc) ++target_link_libraries(XrdDPMRedirAcc-4 dmlite ${XROOTD_LIBRARIES} ${OPENSSL_LIBRARIES}) + + # + # the StatInfo library for the cmsd + # +-add_library(XrdDPMStatInfo-5 SHARED XrdDPMStatInfo.cc XrdDPMCommon.cc) +-target_link_libraries(XrdDPMStatInfo-5 dmlite ${XROOTD_LIBRARIES} ${OPENSSL_LIBRARIES}) ++add_library(XrdDPMStatInfo-4 SHARED XrdDPMStatInfo.cc XrdDPMCommon.cc) ++target_link_libraries(XrdDPMStatInfo-4 dmlite ${XROOTD_LIBRARIES} ${OPENSSL_LIBRARIES}) + + # + # the Checksum library for the redirector + # +-add_library(XrdDPMCks-5 SHARED XrdDPMCks.cc XrdDPMCommon.cc) +-target_link_libraries(XrdDPMCks-5 dmlite ${XROOTD_LIBRARIES} ${OPENSSL_LIBRARIES}) ++add_library(XrdDPMCks-4 SHARED XrdDPMCks.cc XrdDPMCommon.cc) ++target_link_libraries(XrdDPMCks-4 dmlite ${XROOTD_LIBRARIES} ${OPENSSL_LIBRARIES}) + + # + # install libraries + # +-install(TARGETS XrdDPMOss-5 XrdDPMDiskAcc-5 XrdDPMFinder-5 XrdDPMRedirAcc-5 XrdDPMStatInfo-5 XrdDPMCks-5 ++install(TARGETS XrdDPMOss-4 XrdDPMDiskAcc-4 XrdDPMFinder-4 XrdDPMRedirAcc-4 XrdDPMStatInfo-4 XrdDPMCks-4 + DESTINATION ${INSTALL_PFX_LIB}) diff --git a/dmlite.spec b/dmlite.spec index f0124fd..d1a824f 100644 --- a/dmlite.spec +++ b/dmlite.spec @@ -47,7 +47,7 @@ %global py_app_version 2 %global boost_py2_version 2 %global boost_py3_version 3 -%global xrootd_version 1:5.0.2 +%global xrootd_version 1:5.2.0 %global xrootd_version_major 5 %if %{?fedora}%{!?fedora:0} >= 31 @@ -103,19 +103,21 @@ %{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo 0-0)}} Name: dmlite -Version: 1.14.2 -Release: 8%{?dist}%{?_with_asan:.asan} +Version: 1.15.0 +Release: 1%{?dist}%{?_with_asan:.asan} Summary: Lcgdm grid data management and storage framework Group: Applications/Internet License: ASL 2.0 URL: https://gitlab.cern.ch/lcgdm/dmlite # The source of this package was pulled from upstream's vcs. Use the # following commands to generate the tarball: -# git clone http://gitlab.cern.ch/lcgdm/dmlite.git -# cd dmlite && git archive --prefix dmlite-1.14.2/ tags/v1.14.2 | gzip > dmlite-1.14.2.tar.gz +# git clone http://gitlab.cern.ch/lcgdm/dmlite.git && cd dmlite +# git archive --prefix dmlite-1.15.0/ tags/v1.15.0c | gzip > dmlite-1.15.0.tar.gz +# git diff 9fadf8525087f5f9..9fadf8525087f5f9^ src > dmlite-xrootd4-revert.patch Source0: %{name}-%{version}.tar.gz -Patch0: dmlite-python3.patch +#Patch5: dmlite-xrootd4-revert.patch +#Patch0: dmlite-python3.patch %if %{?fedora}%{!?fedora:0} >= 17 || %{?rhel}%{!?rhel:0} >= 7 BuildRequires: boost-devel >= 1.48.0 @@ -710,6 +712,7 @@ commands for system administration, testers and power users. %{_bindir}/dpm-storage-summary.py %{_bindir}/dpm-storage-summary.cgi %{_bindir}/dome-info-provider.py +%{_datarootdir}/dmlite/utils %{_sharedstatedir}/bdii/gip/provider/dome-info-exec %config(noreplace) %{_sysconfdir}/sysconfig/dpminfo %if %{py_app_version} == 2 @@ -831,8 +834,11 @@ This package provides the modules for the DPM configuration via puppet %prep %setup -q +%if %{xrootd_version_major} == 4 +#patch5 -p1 +%endif %if %{py_app_version} == 3 -%patch0 -p1 +#patch0 -p1 %endif %build @@ -913,6 +919,8 @@ mkdir -p %{basefolder}/bdii tar zxvf src/puppet/CERNOps-bdii-*.tar.gz -C %{basefolder}/bdii/ --strip-components 1 mkdir -p %{basefolder}/fetchcrl tar zxvf src/puppet/puppet-fetchcrl-*.tar.gz -C %{basefolder}/fetchcrl/ --strip-components 1 +mkdir -p %{basefolder}/firewalld +tar zxvf src/puppet/puppet-firewalld-*.tar.gz -C %{basefolder}/firewalld/ --strip-components 1 mkdir -p %{basefolder}/firewall tar zxvf src/puppet/puppetlabs-firewall-*.tar.gz -C %{basefolder}/firewall/ --strip-components 1 mkdir -p %{basefolder}/memcached @@ -928,6 +936,9 @@ tar zxvf src/puppet/puppetlabs-translate-*.tar.gz -C %{basefolder}/translate/ - mkdir -p %{basefolder}/voms tar zxvf src/puppet/lcgdm-voms-*.tar.gz -C %{basefolder}/voms/ --strip-components 1 +## legacy scripts integrated in dmlite-shell +%{__ln_s} %{_datarootdir}/dmlite/utils/dmlite-mysql-dirspaces.py %{buildroot}%{_bindir}/ + ## for dpm-xrootd %{__ln_s} libXrdDPMFinder-%{xrootd_version_major}.so %{buildroot}%{_libdir}/libXrdDPMFinder.so-%{xrootd_version_major}.3 %{__ln_s} libXrdDPMDiskAcc-%{xrootd_version_major}.so %{buildroot}%{_libdir}/libXrdDPMDiskAcc.so-%{xrootd_version_major}.3 @@ -1036,21 +1047,31 @@ install -p -d -m 755 %{buildroot}%{_localstatedir}/log/dpm-gsiftp %changelog +* Mon Jun 14 2021 Petr Vokac - 1.15.0-1 +- New release with few additional bugfixes LCGDM-2975, LCGDM-2974 + * Fri Jun 04 2021 Python Maint - 1.14.2-8 - Rebuilt for Python 3.10 * Sun Mar 28 2021 Petr Vokac - 1.14.2-7 - Cleanup and CentOS8 support -* Tue Jan 26 2021 Fedora Release Engineering - 1.14.2-4 +* Sat Mar 27 2021 Petr Vokac - 1.14.2-6 +- Bugfixes: LCGDM-2958, LCGDM-2961, LCGDM-2963, LCGDM-2964, OOB reads +- Improvements: LCGDM-2943, LCGDM-2959, LCGDM-2962, LCGDM-2967, davs speed + +* Tue Jan 26 2021 Fedora Release Engineering - 1.14.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild -* Fri Jan 22 2021 Jonathan Wakely - 1.14.2-3 +* Fri Jan 22 2021 Jonathan Wakely - 1.14.2-4 - Rebuilt for Boost 1.75 -* Thu Jan 14 08:47:49 CET 2021 Adrian Reber - 1.14.2-2 +* Thu Jan 14 2021 Adrian Reber - 1.14.2-3 - Rebuilt for protobuf 3.14 +* Tue Dec 29 2020 Petr Vokac - 1.14.2-2 +- Bugfixes: LCGDM-2948, LCGDM-2949, LCGDM-2950, LCGDM-2954, LCGDM-2953, LCGDM-2955, LCGDM-2957 + * Mon Nov 02 2020 Oliver Keeble - 1.14.2-1 - New upstream release 1.14.2 diff --git a/sources b/sources index f215011..9112d11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dmlite-1.14.2.tar.gz) = 8765bd30c9c1c1b7b5fe0433642fc89eba848b8ee1e5122080d955c5efc854302784ebc107984112da908c591522a1c794cd3db9fe13debd7c45faab72b2b3e3 +SHA512 (dmlite-1.15.0.tar.gz) = 9fb9d29d999ebde76af5180e5672a44b74fb185fefe510efeec1ac3a14c5a1bcf5fd2315a6522fff5310a862d4c2d786d4334e1e88fee7dde76873dc961f58f5