[lcgdm/el6] Patch for dpm-listspaces

[Alejandro Alvarez]

commit 2dec0c82d94d23be5960c863d1ccdf90d9645900
Author: aalvarez <aalvarez at cern.ch>
Date:   Thu Apr 10 13:53:09 2014 +0200

    Patch for dpm-listspaces

 lcgdm-dpm-listspaces.patch |   54 ++++++++++++++++++++++++++++++++++++++++++++
 lcgdm.spec                 |    9 ++++++-
 2 files changed, 62 insertions(+), 1 deletions(-)
---
diff --git a/lcgdm-dpm-listspaces.patch b/lcgdm-dpm-listspaces.patch
new file mode 100644
index 0000000..6e54509
--- /dev/null
+++ b/lcgdm-dpm-listspaces.patch
@@ -0,0 +1,54 @@
+*** dpm/dpm-listspaces.prev 2014-03-28 15:36:27.000000000 +0100
+--- dpm/dpm-listspaces  2014-04-09 16:30:35.962651800 +0200
+***************
+*** 46,51 ****
+--- 46,52 ----
+  import socket
+  import re
+  import subprocess
++ import signal
+  from optparse import OptionParser
+  from time import strftime, gmtime
+  
+***************
+*** 805,812 ****
+            self.interface['webdav'] = params
+            self.access['webdav'] = { 'port': webdav, 'version': self.version, 'security': 'GSI' }
+        if xroot:
+!         xrootd_query,error = subprocess.Popen("xrdfs "+socket.getfqdn()+" query stats p",shell=True,
+!             stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+          if error:
+              xrootd_version = 'None'
+          else:
+--- 806,819 ----
+            self.interface['webdav'] = params
+            self.access['webdav'] = { 'port': webdav, 'version': self.version, 'security': 'GSI' }
+        if xroot:
+!         pro = subprocess.Popen("xrdfs "+socket.getfqdn()+" query stats p",shell=True,
+!             stdout=subprocess.PIPE, stderr=subprocess.PIPE, preexec_fn=os.setsid)
+!         xrootd_query = pro.stdout.readline()
+!         try:
+!           os.killpg(pro.pid, signal.SIGKILL)
+!         except:
+!           pass
+!         error = pro.communicate()[1]
+          if error:
+              xrootd_version = 'None'
+          else:
+***************
+*** 1006,1012 ****
+          security = 'unset'
+          
+        for glue_version in glue_versions:
+!         if glue_version == 'v1':
+            print "dn: GlueSEAccessProtocolLocalID="+protocol_localid+",GlueSEUniqueID="+self.name+",mds-vo-name=resource,o=grid\n" + \
+                  "objectClass: GlueTop\n" + \
+                  "objectClass: GlueSEAccessProtocol\n" + \
+--- 1013,1019 ----
+          security = 'unset'
+          
+        for glue_version in glue_versions:
+!         if glue_version == 'v1' and protocol not in ['webdav', 'xrootd']:
+            print "dn: GlueSEAccessProtocolLocalID="+protocol_localid+",GlueSEUniqueID="+self.name+",mds-vo-name=resource,o=grid\n" + \
+                  "objectClass: GlueTop\n" + \
+                  "objectClass: GlueSEAccessProtocol\n" + \
diff --git a/lcgdm.spec b/lcgdm.spec
index 51da6dc..8e306bc 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -41,7 +41,7 @@
 
 Name:		lcgdm
 Version:	1.8.8
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	LHC Computing Grid Data Management
 
 Group:		Applications/Internet
@@ -57,6 +57,9 @@ Source1:	%{name}-unitfiles.tar.gz
 Patch0:		%{name}-python-exception.patch
 #		https://its.cern.ch/jira/browse/LCGDM-1332
 Patch1:		%{name}-globus_thread_model.patch
+#   https://its.cern.ch/jira/browse/LCGDM-1380
+#   https://its.cern.ch/jira/browse/LCGDM-1386
+Patch2:   %{name}-dpm-listspaces.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{?rhel}%{!?rhel:0} == 5
@@ -519,6 +522,7 @@ pushd $d/%{name}-%{version}
 
 %patch0 -p1
 %patch1 -p0
+%patch2 -p0
 
 chmod 644 security/globus_gsi_gss_constants.h \
 	  security/globus_i_gsi_credential.h \
@@ -1686,6 +1690,9 @@ fi
 %endif
 
 %changelog
+* Thu Apr 10 2014 Alejandro Alvarez <aalvarez at cern.ch> - 1.8.8-4
+- Patch: LCGDM-1380 and LCGDM-1386
+
 * Fri Mar 28 2014 Alejandro Alvarez <aalvarez at cern.ch> - 1.8.8-3
 - Patch: dpm-drain: needs GLOBUS_THREAD_MODEL set