[globus-ftp-client/el5] Update to Globus Toolkit 5.2.1

[Mattias Ellert]

commit 3a8799a71494c3a89572c57a1bf7d1e0c11150d2
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Tue May 1 21:47:03 2012 +0200

    Update to Globus Toolkit 5.2.1
    
    - Drop patch globus-ftp-client-deps.patch (fixed upstrem)

 globus-ftp-client-deps.patch  |   78 -----------------------------------------
 globus-ftp-client-v2def.patch |   46 ++++++++++++++++++++++++
 globus-ftp-client.spec        |   19 ++++++++--
 sources                       |    2 +-
 4 files changed, 62 insertions(+), 83 deletions(-)
---
diff --git a/globus-ftp-client-v2def.patch b/globus-ftp-client-v2def.patch
new file mode 100644
index 0000000..3cab0ad
--- /dev/null
+++ b/globus-ftp-client-v2def.patch
@@ -0,0 +1,46 @@
+diff -ur globus_ftp_client-7.2.orig/globus_ftp_client_attr.c globus_ftp_client-7.2/globus_ftp_client_attr.c
+--- globus_ftp_client-7.2.orig/globus_ftp_client_attr.c	2011-12-05 15:21:04.000000000 +0100
++++ globus_ftp_client-7.2/globus_ftp_client_attr.c	2012-04-27 09:55:52.940788216 +0200
+@@ -249,6 +249,9 @@
+ globus_ftp_client_handleattr_init(
+     globus_ftp_client_handleattr_t *		attr)
+ {
++    /* *** START RESOLUTION ggus 81230 ***/
++    char *					tmpstr;
++    /* *** END RESOLUTION ggus 81230 ***/
+     globus_i_ftp_client_handleattr_t *		i_attr;
+     GlobusFuncName(globus_ftp_client_handleattr_init);
+ 
+@@ -273,6 +276,32 @@
+     i_attr->pipeline_arg = GLOBUS_NULL;
+     i_attr->pipeline_done = GLOBUS_FALSE;
+     i_attr->gridftp2 = GLOBUS_FALSE;
++
++    /* *** START RESOLUTION ggus 81230 ***
++     * Temporary addition to help solve an FTS issue which needs the environment
++     * variable. The additions should be removed/checked again when 5.2.2 is
++     * released. Patch is based on VDT.
++     */
++
++    /* Use of gridftp2 defaults to false, unless
++     * GLOBUS_FTP_CLIENT_GRIDFTP2 has been set to 'true', 'enabled',
++     * or 'yes'.
++     */
++    tmpstr = globus_libc_getenv("GLOBUS_FTP_CLIENT_GRIDFTP2");
++    if(tmpstr != GLOBUS_NULL 
++       && (strncasecmp(tmpstr, "true", 5) == 0
++           || strncasecmp(tmpstr, "enabled", 8) == 0
++           || strncasecmp(tmpstr, "yes", 4) == 0))
++    {
++         i_attr->gridftp2 = GLOBUS_TRUE;
++    }
++    else
++    {
++         i_attr->gridftp2 = GLOBUS_FALSE;
++    }
++
++    /* *** END RESOLUTION ggus 81230 ***/
++
+     i_attr->clientinfo_app_name = 
+         globus_libc_strdup(GLOBUS_L_FTP_CLIENT_CLIENTINFO_APPNAME);
+     i_attr->clientinfo_app_ver = 
diff --git a/globus-ftp-client.spec b/globus-ftp-client.spec
index 699e2e8..eeab437 100644
--- a/globus-ftp-client.spec
+++ b/globus-ftp-client.spec
@@ -6,20 +6,22 @@
 
 Name:		globus-ftp-client
 %global _name %(tr - _ <<< %{name})
-Version:	7.2
-Release:	2%{?dist}
+Version:	7.3
+Release:	1%{?dist}
 Summary:	Globus Toolkit - GridFTP Client Library
 
 Group:		System Environment/Libraries
 License:	ASL 2.0
 URL:		http://www.globus.org/
-Source:		http://www.globus.org/ftppub/gt5/5.2/5.2.0/packages/src/%{_name}-%{version}.tar.gz
+Source:		http://www.globus.org/ftppub/gt5/5.2/5.2.1/packages/src/%{_name}-%{version}.tar.gz
 #		README file
 Source8:	GLOBUS-GRIDFTP
 #		This is a workaround for the broken epstopdf script in RHEL5
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
 Source9:	epstopdf-2.9.5gw
-Patch0:		%{name}-deps.patch
+#		Patch needed (temporarily) to enable gridftp2 via an
+#		environment variable
+Patch0:		%{name}-v2def.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-gsi-credential%{?_isa} >= 5
@@ -197,6 +199,15 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Fri Apr 27 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.3-1
+- Update to Globus Toolkit 5.2.1
+- Drop patch globus-ftp-client-deps.patch (fixed upstrem)
+
+* Fri Apr 27 2012 Emmanouil Paisios <paisios at lrz.de> - 7.2-3
+- Added patch from VDT for enabling gridftp v2 via the environment variable
+  GLOBUS_FTP_CLIENT_GRIDFTP2.
+  See https://ggus.eu/tech/ticket_show.php?ticket=81230 for details.
+
 * Tue Jan 24 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.2-2
 - Fix broken links in README file
 
diff --git a/sources b/sources
index ca30cc7..82c1ebe 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-5244b3aec730f89880574457677fc860  globus_ftp_client-7.2.tar.gz
+26b5032f4c8824fc1f3a7997ae4965c5  globus_ftp_client-7.3.tar.gz