[lcgdm/el5] Patch for dpm-listspaces and dav publishing

[Alejandro Alvarez]

commit e3eb5bb34b908e58907a6e941b8ec97a515bb1ab
Author: Alejandro Alvarez Ayllon <alejandro.alvarez.ayllon at cern.ch>
Date:   Thu Oct 16 15:09:23 2014 +0200

    Patch for dpm-listspaces and dav publishing

 lcgdm-dpm-listspaces-dav.patch  |   13 +++++++++
 lcgdm-dpm-listspaces.patch      |   54 ---------------------------------------
 lcgdm-globus_thread_model.patch |   17 ------------
 lcgdm.spec                      |    9 ++++++-
 4 files changed, 21 insertions(+), 72 deletions(-)
---
diff --git a/lcgdm-dpm-listspaces-dav.patch b/lcgdm-dpm-listspaces-dav.patch
new file mode 100644
index 0000000..db622c5
--- /dev/null
+++ b/lcgdm-dpm-listspaces-dav.patch
@@ -0,0 +1,13 @@
+Index: dpm/dpm-listspaces
+===================================================================
+--- dpm/dpm-listspaces	(revision 10742)
++++ dpm/dpm-listspaces	(revision 11102)
+@@ -802,7 +802,7 @@
+         if params.enabled():
+           self.control['srmv2'] = params
+       # self.interface is for webdav/xroot
+-      if webdav:
++      if webdav and subprocess.Popen("grep -sF mod_lcgdm_dav.so /proc/`pgrep -ox -u root httpd.event`/maps",shell=True,stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0]:
+         params = Interface(name='webdav',protocol="https",port=webdav,version=self.version, semantics='http://tools.ietf.org/html/rfc4918')
+         if params.enabled():
+           self.access['webdav'] = {'protocol': 'https', 'port': webdav, 'version': self.version, 'security': 'GSI' }
diff --git a/lcgdm.spec b/lcgdm.spec
index 793fa8c..3d22838 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -41,7 +41,7 @@
 
 Name:		lcgdm
 Version:	1.8.9
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	LHC Computing Grid Data Management
 
 Group:		Applications/Internet
@@ -55,6 +55,9 @@ Source1:	%{name}-unitfiles.tar.gz
 #		Remove deprecated python function:
 #		https://savannah.cern.ch/bugs/?69232
 Patch0:		%{name}-python-exception.patch
+# Check for mod_dav before publishing
+# https://its.cern.ch/jira/browse/LCGDM-1576
+Patch1:		%{name}-dpm-listspaces-dav.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{?rhel}%{!?rhel:0} == 5
@@ -516,6 +519,7 @@ for d in lfc-mysql dpm-mysql ; do
 pushd $d/%{name}-%{version}
 
 %patch0 -p1
+%patch1 -p0
 
 chmod 644 security/globus_gsi_gss_constants.h \
 	  security/globus_i_gsi_credential.h \
@@ -1683,6 +1687,9 @@ fi
 %endif
 
 %changelog
+* Thu Oct 16 2014 Alejandro Alvarez Ayllon <aalvarez at cern.ch> - 1.8.9-2
+- Patch for dpm-listspaces and dav publishing
+
 * Wed Sep 24 2014 Alejandro Alvarez <aalvarez at cern.ch> - 1.8.9-1
 - Update for new upstream release