Merge pull request #123 from chaen/upgradeXrootGfal2

Upgrade xroot gfal2

Author: Marko Petric

README.md

@@ -44,6 +44,7 @@ DIRACOS aims at bringing in one archive all the dependencies needed by DIRAC to
   * [ Singularity](docs/50_troubleshoot.md#singularity)
   * [ About manualDependencies](docs/50_troubleshoot.md#about-manualdependencies)
   * [ LDD check failing](docs/50_troubleshoot.md#ldd-check-failing)
+  * [ldconfig_scriptlets](docs/50_troubleshoot.md#ldconfig_scriptlets)
 - [ Test DIRACOS as a User](docs/60_useDIRACOS.md#test-diracos-as-a-user)
 - [ Make a new release](docs/70_release.md#make-a-new-release)
   * [ Versioning](docs/70_release.md#versioning)

config/diracos.json

@@ -453,8 +453,9 @@
                   "buildOnly": true
                },
                {
-                  "src": "https://diracos.web.cern.ch/diracos/SRPM/xrootd-4.10.0-1.el7.src.rpm",
+                  "src": "https://diracos.web.cern.ch/diracos/SRPM/xrootd-4.11.2-1.el7.src.rpm",
                   "comment": "The SRPM for scl6 and cc7 are the same, and they only provide cc7",
+                  "originalRepo": "http://xrootd.web.cern.ch/xrootd/sw/releases",
                   "name": "xrootd",
                   "pkgList": [
                      "xrootd",
@@ -472,7 +473,8 @@
             "name": "davix",
             "packages": [
                {
-                  "src": "https://diracos.web.cern.ch/diracos/SRPM/davix-0.7.2-2.el6.src.rpm",
+                  "src": "https://diracos.web.cern.ch/diracos/SRPM/davix-0.7.5-1.el6.src.rpm",
+                  "originalRepo": "https://dl.fedoraproject.org/pub/epel/6/SRPMS/Packages/",
                   "name": "davix"
                }
             ]
@@ -535,7 +537,8 @@
                   "buildOnly": true
                },
                {
-                  "src": "https://diracos.web.cern.ch/diracos/SRPM/gfal2-2.16.1-1.el6.src.rpm",
+                  "src": "https://diracos.web.cern.ch/diracos/SRPM/gfal2-2.17.1-1.el6_10.src.rpm",
+                  "originalRepo": "https://dl.fedoraproject.org/pub/epel/6/SRPMS/Packages/",
                   "excludePatterns": [
                      ".*-doc-.*",
                      ".*-debuginfo-.*",

docs/50_troubleshoot.md

@@ -96,4 +96,20 @@ The packages that are in `manualDependencies` are added to the dependencies that
 
 ## LDD check failing
 
-The `check_ldd` test looks at the dependencies of the binaries in DIRACOS. It finds those pointing outside of DIRACOS (can be due to rpath) and those not found. There is a list of known "broken" dependencies (`tests/integration/knownMissingDependencies.txt`). Ideally, this list should be empty, but it will never be the case. So if you cannot do differently, you can always add your libraries there.
+The `check_ldd` test looks at the dependencies of the binaries in DIRACOS. It finds those pointing outside of DIRACOS (can be due to rpath) and those not found. There is a list of known "broken" dependencies (`tests/integration/knownMissingDependencies.txt`). Ideally, this list should be empty, but it will never be the case. So if you cannot do differently, you can always add your libraries there.
+
+## ldconfig_scriptlets
+
+Some spec files use `ldconfig_scriptlets` to trigger `ldconfig`. This does not work with DIRACOS because it relies on some packages in EPEL that we exclude on purpose. You can simply replace
+
+```
+%ldconfig_scriptlets <A PACKAGE>
+```
+
+with
+
+```
+%post <A PACKAGE> -p /sbin/ldconfig
+
+%postun <A PACKAGE> -p /sbin/ldconfig
+```

patches/davix.patch

@@ -1,7 +1,7 @@
-diff -u -r original/davix.spec modified/davix.spec
---- original/davix.spec 2019-03-20 11:54:36.000000000 +0100
-+++ modified/davix.spec 2019-05-08 17:37:46.416589447 +0200
-@@ -25,10 +25,6 @@
+diff -r -u original/davix.spec modified/davix.spec
+--- original/davix.spec 2019-08-28 09:13:40.000000000 +0000
++++ modified/davix.spec 2020-02-13 14:16:43.513053440 +0000
+@@ -22,10 +22,6 @@
  # davix-copy dependencies
  BuildRequires:                  gsoap-devel
  BuildRequires:                  libuuid-devel
@@ -12,7 +12,7 @@ diff -u -r original/davix.spec modified/davix.spec
 
  Requires:                       %{name}-libs%{?_isa} = %{version}-%{release}
  Requires:                       libuuid
-@@ -86,18 +82,15 @@
+@@ -83,18 +79,14 @@
  make %{?_smp_mflags}
  make doc
 
@@ -21,7 +21,7 @@ diff -u -r original/davix.spec modified/davix.spec
 -#make abi-check
 -%endif
 -ctest -V -T Test
-
+-
 
  %install
  rm -rf %{buildroot}

patches/gfal2.patch

@@ -0,0 +1,14 @@
+diff -r -u original/gfal2.spec modified/gfal2.spec
+--- original/gfal2.spec 2019-12-13 11:06:42.000000000 +0000
++++ modified/gfal2.spec 2020-02-13 15:12:26.529528637 +0000
+@@ -283,7 +283,9 @@
+ make DESTDIR=%{buildroot} install
+
+
+-%ldconfig_scriptlets
++%post -p /sbin/ldconfig
++
++%postun -p /sbin/ldconfig
+
+ %files
+ %{_bindir}/gfal2_version

patches/xrootd.patch

@@ -1,22 +1,22 @@
 diff -r -u original/xrootd.spec modified/xrootd.spec
---- original/xrootd.spec	2019-07-15 09:31:42.000000000 +0000
-+++ modified/xrootd.spec	2019-09-26 11:25:07.119885691 +0000
+--- original/xrootd.spec        2020-02-03 09:55:51.000000000 +0000
++++ modified/xrootd.spec        2020-02-13 12:30:05.051221133 +0000
 @@ -77,11 +77,6 @@
  BuildRequires: json-c-devel
- 
+
  BuildRequires: python2-devel
 -%if %{?fedora}%{!?fedora:0} >= 13
 -BuildRequires: python3-devel
 -%else
 -BuildRequires: python%{python3_pkgversion}-devel
 -%endif
- 
+
  BuildRequires: openssl-devel
- 
+
 @@ -300,21 +295,6 @@
  %description -n python2-xrootd
  Python 2 bindings for XRootD
- 
+
 -%if %{?_with_python3:1}%{!?_with_python3:0}
 -#-------------------------------------------------------------------------------
 -# python3
@@ -32,44 +32,44 @@ diff -r -u original/xrootd.spec modified/xrootd.spec
 -%description -n python3-xrootd
 -Python 3 bindings for XRootD
 -%endif
- 
+
  #-------------------------------------------------------------------------------
  # doc
 @@ -464,12 +444,6 @@
  popd
  %endif
- 
+
 -%if %{?_with_python3:1}%{!?_with_python3:0}
 -# build python3 bindings
 -pushd build/bindings/python
 -%py3_build
 -popd
 -%endif
- 
+
  #-------------------------------------------------------------------------------
  # Installation
 @@ -586,12 +560,6 @@
  install -m 644 -p packaging/common/xrootd.pp \
      %{buildroot}%{_datadir}/selinux/packages/%{name}/%{name}.pp
- 
+
 -%if %{?_with_python3:1}%{!?_with_python3:0}
 -# install python3 bindings
 -pushd build/bindings/python
 -%py3_install
 -popd
 -%endif
- 
+
  %clean
  rm -rf $RPM_BUILD_ROOT
-@@ -880,11 +848,6 @@
+@@ -883,11 +851,6 @@
  %files -n python2-%{name} -f xrootd/build/PYTHON_INSTALLED_FILES
  %defattr(-,root,root,-)
- 
+
 -%if %{?_with_python3:1}%{!?_with_python3:0}
 -%files -n python3-%{name}
 -%defattr(-,root,root,-)
 -%{python3_sitearch}/*
 -%endif
- 
+
  %files doc
- %defattr(-,root,root,-)
+ %defattr(-,root,root,-)

tests/integration/knownMissingDependencies.txt

@@ -1,16 +1,9 @@
-libICE.so.6
-libSM.so.6
-libXdamage.so.1
-libXfixes.so.3
-libXft.so.2
-libXrender.so.1
-libXxf86vm.so.1
 libacl.so.1
 libasound.so.2
 libaudit.so.1
-libc.so.6
 libcap.so.2
 libcrypt.so.1
+libc.so.6
 libdbus-glib-1.so.2
 libdl.so.2
 libdrm.so.2
@@ -28,23 +21,25 @@ libgstinterfaces-0.10.so.0
 libgstreamer-0.10.so.0
 libgstvideo-0.10.so.0
 libhesiod.so.0
+libICE.so.6
 libidn.so.11
 libjpeg.so.62
 liblua-5.1.so
-libm.so.6
 libmagic.so.1
 libmng.so.1
+libm.so.6
 libnsl.so.1
 libpcreposix.so.0
 libpixman-1.so.0
 libpopt.so.0
 libpthread.so.0
 libreadline.so.5
 libresolv.so.2
-librpm.so.1
 librpmbuild.so.1
 librpmio.so.1
+librpm.so.1
 librt.so.1
+libSM.so.6
 libstdc++.so.6
 libthai.so.0
 libtiff.so.3
@@ -53,4 +48,10 @@ libutil.so.1
 libxcb-dri2.so.0
 libxcb-glx.so.0
 libxcb.so.1
+libXdamage.so.1
+libXfixes.so.3
+libXft.so.2
+libxml2.so.2
+libXrender.so.1
+libXxf86vm.so.1
 libz-a147dcb0.so.1.2.3