[lcgdm/el5] Patch: dpm-drain: needs GLOBUS_THREAD_MODEL set

[Alejandro Alvarez]

commit 068263b5273b40c2a65d930d1ee3075b974e3553
Author: aalvarez <alejandro.alvarez.ayllon at cern.ch>
Date:   Fri Mar 28 13:56:10 2014 +0100

    Patch: dpm-drain: needs GLOBUS_THREAD_MODEL set

 lcgdm-globus_thread_model.patch |   17 +++++++++++++++++
 lcgdm.spec                      |    8 +++++++-
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/lcgdm-globus_thread_model.patch b/lcgdm-globus_thread_model.patch
new file mode 100644
index 0000000..bc30a17
--- /dev/null
+++ b/lcgdm-globus_thread_model.patch
@@ -0,0 +1,17 @@
+Index: security/Csec_plugin_GSS.c
+===================================================================
+--- security/Csec_plugin_GSS.c	(.../tags/LCG-DM_1_8_8_1b/security/Csec_plugin_GSS.c)	(revision 10273)
++++ security/Csec_plugin_GSS.c	(.../trunk/security/Csec_plugin_GSS.c)	(revision 10273)
+@@ -150,11 +150,6 @@
+   Cmutex_lock(&activate_lock, -1);
+   /* Globus module activate/deactiate should be thread safe, but I mutex protect it here anyway */
+ 
+-  if (!once) {
+-    if (ctx->thread_safe && Cthread_getenv("CSEC_NOTHREAD") == NULL)
+-      globus_thread_set_model("pthread");
+-  }
+-
+   (void)globus_module_activate(GLOBUS_GSI_GSS_ASSIST_MODULE);
+   (void)globus_module_activate(GLOBUS_GSI_GSSAPI_MODULE);
+   (void)globus_module_activate(GLOBUS_GSI_CREDENTIAL_MODULE);
+
diff --git a/lcgdm.spec b/lcgdm.spec
index 1c29ca6..21f4c74 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -41,7 +41,7 @@
 
 Name:		lcgdm
 Version:	1.8.8
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	LHC Computing Grid Data Management
 
 Group:		Applications/Internet
@@ -55,6 +55,8 @@ Source1:	%{name}-unitfiles.tar.gz
 #		Remove deprecated python function:
 #		https://savannah.cern.ch/bugs/?69232
 Patch0:		%{name}-python-exception.patch
+#		https://its.cern.ch/jira/browse/LCGDM-1332
+Patch1:		%{name}-globus_thread_model.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{?rhel}%{!?rhel:0} == 5
@@ -516,6 +518,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 \
@@ -1684,6 +1687,9 @@ fi
 %endif
 
 %changelog
+* Fri Mar 28 2014 Alejandro Alvarez <aalvarez at cern.ch> - 1.8.8-3
+- Patch: dpm-drain: needs GLOBUS_THREAD_MODEL set
+
 * Fri Mar 14 2014 Alejandro Alvarez <aalvarez at cern.ch> - 1.8.8-2
 - Upstream provided a wrong tag by mistake. Rebuild with the new code