rpms/globus-ftp-client/F-12 .cvsignore, 1.2, 1.3 globus-ftp-client-doxygen.patch, 1.1, 1.2 globus-ftp-client.spec, 1.3, 1.4 import.log, 1.2, 1.3 sources, 1.2, 1.3

Mattias Ellert ellert at fedoraproject.org
Tue Feb 9 08:34:28 UTC 2010


Author: ellert

Update of /cvs/pkgs/rpms/globus-ftp-client/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21573/F-12

Modified Files:
	.cvsignore globus-ftp-client-doxygen.patch 
	globus-ftp-client.spec import.log sources 
Log Message:
* Sat Jan 23 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.2-1
- Update to Globus Toolkit 5.0.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-ftp-client/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	4 Jun 2009 03:57:20 -0000	1.2
+++ .cvsignore	9 Feb 2010 08:34:28 -0000	1.3
@@ -1,2 +1,2 @@
 epstopdf-2.9.5gw
-globus_ftp_client-3.14.tar.gz
+globus_ftp_client-5.2.tar.gz

globus-ftp-client-doxygen.patch:
 globus_ftp_client.h                       |    2 -
 globus_ftp_client_attr.c                  |   12 ++++----
 globus_ftp_client_data.c                  |    1 
 globus_ftp_client_debug_plugin.c          |    2 +
 globus_ftp_client_plugin.c                |   44 +++++++++++++++---------------
 globus_ftp_client_plugin.h                |    2 -
 globus_ftp_client_restart_marker_plugin.h |    4 +-
 globus_ftp_client_restart_plugin.h        |    2 -
 globus_ftp_client_throughput_nl_plugin.c  |    2 +
 globus_ftp_client_throughput_nl_plugin.h  |   28 +++++++++----------
 globus_ftp_client_transfer.c              |    5 ++-
 11 files changed, 57 insertions(+), 47 deletions(-)

Index: globus-ftp-client-doxygen.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-ftp-client/F-12/globus-ftp-client-doxygen.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-ftp-client-doxygen.patch	4 Jun 2009 03:57:20 -0000	1.1
+++ globus-ftp-client-doxygen.patch	9 Feb 2010 08:34:28 -0000	1.2
@@ -1,7 +1,7 @@
-diff -ur globus_ftp_client-3.14.orig/globus_ftp_client_attr.c globus_ftp_client-3.14/globus_ftp_client_attr.c
---- globus_ftp_client-3.14.orig/globus_ftp_client_attr.c	2008-04-04 03:51:47.000000000 +0200
-+++ globus_ftp_client-3.14/globus_ftp_client_attr.c	2009-04-05 12:52:43.000000000 +0200
-@@ -359,7 +359,7 @@
+diff -ur globus_ftp_client-5.2.orig/globus_ftp_client_attr.c globus_ftp_client-5.2/globus_ftp_client_attr.c
+--- globus_ftp_client-5.2.orig/globus_ftp_client_attr.c	2008-10-29 23:59:05.000000000 +0100
++++ globus_ftp_client-5.2/globus_ftp_client_attr.c	2010-01-23 08:50:29.709280472 +0100
+@@ -500,7 +500,7 @@
   *
   * @param attr
   *        Attribute to modify
@@ -10,7 +10,7 @@ diff -ur globus_ftp_client-3.14.orig/glo
   *        Set to GLOBUS_TRUE to enable GridFTP2 support.
   *        Default of GLOBUS_FALSE specifies that GridFTP is disabled.
   */
-@@ -1841,7 +1841,7 @@
+@@ -1987,7 +1987,7 @@
   *
   * @param attr
   *        The attribute set to query or modify.
@@ -19,7 +19,12 @@ diff -ur globus_ftp_client-3.14.orig/glo
   *        The value of tcp_buffer attribute.
   *
   * @see #globus_gsiftp_control_tcpbuffer_t
-@@ -1939,7 +1939,7 @@
+@@ -2081,11 +2081,11 @@
+  *   data transfer, and then converted to native format before being
+  *   returned to the user's data callbacks.
+  *
+- * The default type for the ftp client libary is binary.
++ * The default type for the ftp client library is binary.
   *
   * @param attr
   *        The attribute set to query or modify.
@@ -28,7 +33,7 @@ diff -ur globus_ftp_client-3.14.orig/glo
   *        The value of type attribute.
   *
   * @see #globus_ftp_control_type_t
-@@ -2035,7 +2035,7 @@
+@@ -2181,7 +2181,7 @@
   *
   * @param attr
   *        The attribute set to query or modify.
@@ -37,7 +42,7 @@ diff -ur globus_ftp_client-3.14.orig/glo
   *        The value of mode attribute
   *
   * @see #globus_ftp_control_mode_t,
-@@ -2124,7 +2124,9 @@
+@@ -2270,7 +2270,9 @@
      return globus_error_put(err);
  }
  /* globus_ftp_client_operationattr_get_mode() */
@@ -47,9 +52,9 @@ diff -ur globus_ftp_client-3.14.orig/glo
  /**
   * Set/Get whether or not list data will use the current data mode
   * @ingroup globus_ftp_client_operationattr
-diff -ur globus_ftp_client-3.14.orig/globus_ftp_client_data.c globus_ftp_client-3.14/globus_ftp_client_data.c
---- globus_ftp_client-3.14.orig/globus_ftp_client_data.c	2008-04-04 03:51:47.000000000 +0200
-+++ globus_ftp_client-3.14/globus_ftp_client_data.c	2009-04-05 12:52:43.000000000 +0200
+diff -ur globus_ftp_client-5.2.orig/globus_ftp_client_data.c globus_ftp_client-5.2/globus_ftp_client_data.c
+--- globus_ftp_client-5.2.orig/globus_ftp_client_data.c	2008-04-04 03:51:47.000000000 +0200
++++ globus_ftp_client-5.2/globus_ftp_client_data.c	2010-01-23 08:46:26.468282590 +0100
 @@ -330,6 +330,7 @@
   *        mode, the data does not need to be sent in order. In stream
   *	  mode (the default), data must be sent in sequential
@@ -58,9 +63,9 @@ diff -ur globus_ftp_client-3.14.orig/glo
   * @param callback
   *        The function to be called once the data has been written.
   * @param callback_arg
-diff -ur globus_ftp_client-3.14.orig/globus_ftp_client_debug_plugin.c globus_ftp_client-3.14/globus_ftp_client_debug_plugin.c
---- globus_ftp_client-3.14.orig/globus_ftp_client_debug_plugin.c	2009-04-05 12:52:11.000000000 +0200
-+++ globus_ftp_client-3.14/globus_ftp_client_debug_plugin.c	2009-04-05 12:52:43.000000000 +0200
+diff -ur globus_ftp_client-5.2.orig/globus_ftp_client_debug_plugin.c globus_ftp_client-5.2/globus_ftp_client_debug_plugin.c
+--- globus_ftp_client-5.2.orig/globus_ftp_client_debug_plugin.c	2007-06-01 19:23:06.000000000 +0200
++++ globus_ftp_client-5.2/globus_ftp_client_debug_plugin.c	2010-01-23 08:46:26.469282996 +0100
 @@ -1199,6 +1199,8 @@
   *        A pointer to an uninitialized plugin. The plugin will be
   *        configured as a debugging plugin, with the default of sending
@@ -70,9 +75,21 @@ diff -ur globus_ftp_client-3.14.orig/glo
   *
   * @return This function returns an error if
   * - plugin is null
-diff -ur globus_ftp_client-3.14.orig/globus_ftp_client_plugin.c globus_ftp_client-3.14/globus_ftp_client_plugin.c
---- globus_ftp_client-3.14.orig/globus_ftp_client_plugin.c	2006-10-14 09:21:56.000000000 +0200
-+++ globus_ftp_client-3.14/globus_ftp_client_plugin.c	2009-04-05 12:52:43.000000000 +0200
+diff -ur globus_ftp_client-5.2.orig/globus_ftp_client.h globus_ftp_client-5.2/globus_ftp_client.h
+--- globus_ftp_client-5.2.orig/globus_ftp_client.h	2009-11-05 23:43:41.000000000 +0100
++++ globus_ftp_client-5.2/globus_ftp_client.h	2010-01-23 08:48:19.084280568 +0100
+@@ -414,7 +414,7 @@
+  *
+  * Create/Destroy/Modify an FTP Client Handle.
+  *
+- * Within the Globus FTP Client Libary, all FTP operations require a
++ * Within the Globus FTP Client Library, all FTP operations require a
+  * handle parameter. Currently, only one FTP operation may be in
+  * progress at once per FTP handle. FTP connections may be cached
+  * between FTP operations, for improved performance.
+diff -ur globus_ftp_client-5.2.orig/globus_ftp_client_plugin.c globus_ftp_client-5.2/globus_ftp_client_plugin.c
+--- globus_ftp_client-5.2.orig/globus_ftp_client_plugin.c	2006-10-14 09:21:56.000000000 +0200
++++ globus_ftp_client-5.2/globus_ftp_client_plugin.c	2010-01-23 08:46:26.470282702 +0100
 @@ -81,12 +81,12 @@
   *
   * @param handle
@@ -238,9 +255,9 @@ diff -ur globus_ftp_client-3.14.orig/glo
   *        The attributes to use for the new operation. This may be a
   *        modified version of the original operations's attribute set.
   * @param when
-diff -ur globus_ftp_client-3.14.orig/globus_ftp_client_plugin.h globus_ftp_client-3.14/globus_ftp_client_plugin.h
---- globus_ftp_client-3.14.orig/globus_ftp_client_plugin.h	2008-04-04 03:51:47.000000000 +0200
-+++ globus_ftp_client-3.14/globus_ftp_client_plugin.h	2009-04-05 12:54:46.000000000 +0200
+diff -ur globus_ftp_client-5.2.orig/globus_ftp_client_plugin.h globus_ftp_client-5.2/globus_ftp_client_plugin.h
+--- globus_ftp_client-5.2.orig/globus_ftp_client_plugin.h	2008-04-04 03:51:47.000000000 +0200
++++ globus_ftp_client-5.2/globus_ftp_client_plugin.h	2010-01-23 08:46:26.470282702 +0100
 @@ -947,7 +947,7 @@
   * @ingroup globus_ftp_client_plugins
   *
@@ -250,9 +267,42 @@ diff -ur globus_ftp_client-3.14.orig/glo
   * function for response callbacks associated with a command which is
   * in the plugin's command mask, and associated with one of the other
   * ftp operations with a defined callback in the plugin.
-diff -ur globus_ftp_client-3.14.orig/globus_ftp_client_throughput_nl_plugin.c globus_ftp_client-3.14/globus_ftp_client_throughput_nl_plugin.c
---- globus_ftp_client-3.14.orig/globus_ftp_client_throughput_nl_plugin.c	2009-04-05 12:52:11.000000000 +0200
-+++ globus_ftp_client-3.14/globus_ftp_client_throughput_nl_plugin.c	2009-04-05 12:52:43.000000000 +0200
+diff -ur globus_ftp_client-5.2.orig/globus_ftp_client_restart_marker_plugin.h globus_ftp_client-5.2/globus_ftp_client_restart_marker_plugin.h
+--- globus_ftp_client-5.2.orig/globus_ftp_client_restart_marker_plugin.h	2006-01-19 06:54:53.000000000 +0100
++++ globus_ftp_client-5.2/globus_ftp_client_restart_marker_plugin.h	2010-01-23 08:52:56.098529908 +0100
+@@ -31,7 +31,7 @@
+  * @defgroup globus_ftp_client_restart_marker_plugin Restart Marker Plugin
+  * @ingroup globus_ftp_client_plugins
+  *
+- * This plugin is intended to allow users to make restart markers persistant.
++ * This plugin is intended to allow users to make restart markers persistent.
+  * During a transfer, every marker received will result in the user's 'marker'
+  * callback being called with the new restart marker that can be stored. If
+  * the application were to prematurely terminate (while transferring), the user
+@@ -71,7 +71,7 @@
+  * started.
+  *
+  * The intended use for this callback is for the user to use the transfer
+- * urls to locate a restart marker in some persistant storage. If one is
++ * urls to locate a restart marker in some persistent storage. If one is
+  * found, it should be copied into 'user_saved_marker' and the callback
+  * should return GLOBUS_TRUE. This will cause the transfer to be restarted
+  * using that restart marker.  If one is not found, return GLOBUS_FALSE to
+diff -ur globus_ftp_client-5.2.orig/globus_ftp_client_restart_plugin.h globus_ftp_client-5.2/globus_ftp_client_restart_plugin.h
+--- globus_ftp_client-5.2.orig/globus_ftp_client_restart_plugin.h	2008-07-15 23:19:38.000000000 +0200
++++ globus_ftp_client-5.2/globus_ftp_client_restart_plugin.h	2010-01-23 08:53:17.717279709 +0100
+@@ -35,7 +35,7 @@
+  * is parameterized to control how often and when to attempt to restart
+  * the operation.
+  *
+- * This restart plugin will restart an FTP operation if a noticable
++ * This restart plugin will restart an FTP operation if a noticeable
+  * fault has occurred---a connection timing out, a failure by the server
+  * to process a command, a protocol error, an authentication error.
+  *
+diff -ur globus_ftp_client-5.2.orig/globus_ftp_client_throughput_nl_plugin.c globus_ftp_client-5.2/globus_ftp_client_throughput_nl_plugin.c
+--- globus_ftp_client-5.2.orig/globus_ftp_client_throughput_nl_plugin.c	2006-01-19 06:54:53.000000000 +0100
++++ globus_ftp_client-5.2/globus_ftp_client_throughput_nl_plugin.c	2010-01-23 08:46:26.471282688 +0100
 @@ -526,6 +526,8 @@
   * provides by using this function to set these callbacks.  Note that
   * the callbacks are defined the same as in the throughput plugin
@@ -262,9 +312,9 @@ diff -ur globus_ftp_client-3.14.orig/glo
   * @param begin_cb
   *        the callback to be called upon the start of a transfer
   *
-diff -ur globus_ftp_client-3.14.orig/globus_ftp_client_throughput_nl_plugin.h globus_ftp_client-3.14/globus_ftp_client_throughput_nl_plugin.h
---- globus_ftp_client-3.14.orig/globus_ftp_client_throughput_nl_plugin.h	2006-01-19 06:54:53.000000000 +0100
-+++ globus_ftp_client-3.14/globus_ftp_client_throughput_nl_plugin.h	2009-04-05 12:45:48.000000000 +0200
+diff -ur globus_ftp_client-5.2.orig/globus_ftp_client_throughput_nl_plugin.h globus_ftp_client-5.2/globus_ftp_client_throughput_nl_plugin.h
+--- globus_ftp_client-5.2.orig/globus_ftp_client_throughput_nl_plugin.h	2006-01-19 06:54:53.000000000 +0100
++++ globus_ftp_client-5.2/globus_ftp_client_throughput_nl_plugin.h	2010-01-23 08:46:26.471282688 +0100
 @@ -39,32 +39,32 @@
   * TransferPerfTotal : This event type will be sent everytime a throughput
   *      plugin total callback is received.
@@ -312,9 +362,9 @@ diff -ur globus_ftp_client-3.14.orig/glo
   *
   */
  
-diff -ur globus_ftp_client-3.14.orig/globus_ftp_client_transfer.c globus_ftp_client-3.14/globus_ftp_client_transfer.c
---- globus_ftp_client-3.14.orig/globus_ftp_client_transfer.c	2008-10-02 05:46:48.000000000 +0200
-+++ globus_ftp_client-3.14/globus_ftp_client_transfer.c	2009-04-05 12:52:43.000000000 +0200
+diff -ur globus_ftp_client-5.2.orig/globus_ftp_client_transfer.c globus_ftp_client-5.2/globus_ftp_client_transfer.c
+--- globus_ftp_client-5.2.orig/globus_ftp_client_transfer.c	2008-09-23 01:07:47.000000000 +0200
++++ globus_ftp_client-5.2/globus_ftp_client_transfer.c	2010-01-23 08:46:26.473530036 +0100
 @@ -2089,7 +2089,7 @@
   * aborted, the complete_callback will be invoked with the final
   * status of the get.


Index: globus-ftp-client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-ftp-client/F-12/globus-ftp-client.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- globus-ftp-client.spec	25 Jul 2009 07:27:33 -0000	1.3
+++ globus-ftp-client.spec	9 Feb 2010 08:34:28 -0000	1.4
@@ -6,19 +6,19 @@
 
 Name:		globus-ftp-client
 %global _name %(tr - _ <<< %{name})
-Version:	3.14
-Release:	3%{?dist}
+Version:	5.2
+Release:	1%{?dist}
 Summary:	Globus Toolkit - GridFTP Client Library
 
 Group:		System Environment/Libraries
 License:	ASL 2.0
 URL:		http://www.globus.org/
 #		Source is extracted from the globus toolkit installer:
-#		wget -N http://www-unix.globus.org/ftppub/gt4/4.2.1/installers/src/gt4.2.1-all-source-installer.tar.bz2
-#		tar -jxf gt4.2.1-all-source-installer.tar.bz2
-#		mv gt4.2.1-all-source-installer/source-trees/gridftp/client/source globus_ftp_client-3.14
-#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_ftp_client-3.14
-#		tar -zcf globus_ftp_client-3.14.tar.gz globus_ftp_client-3.14
+#		wget -N http://www-unix.globus.org/ftppub/gt5/5.0/5.0.0/installers/src/gt5.0.0-all-source-installer.tar.bz2
+#		tar -jxf gt5.0.0-all-source-installer.tar.bz2
+#		mv gt5.0.0-all-source-installer/source-trees/gridftp/client/source globus_ftp_client-5.2
+#		cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_ftp_client-5.2
+#		tar -zcf globus_ftp_client-5.2.tar.gz globus_ftp_client-5.2
 Source:		%{_name}-%{version}.tar.gz
 #		This is a workaround for the broken epstopdf script in RHEL5
 #		See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
@@ -207,6 +207,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Sat Jan 23 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.2-1
+- Update to Globus Toolkit 5.0.0
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.14-3
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-ftp-client/F-12/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	15 Jun 2009 19:35:29 -0000	1.2
+++ import.log	9 Feb 2010 08:34:28 -0000	1.3
@@ -1,2 +1,3 @@
 globus-ftp-client-3_14-1_fc9:HEAD:globus-ftp-client-3.14-1.fc9.src.rpm:1244087779
 globus-ftp-client-3_14-2_fc9:HEAD:globus-ftp-client-3.14-2.fc9.src.rpm:1245094507
+globus-ftp-client-5_2-1_fc12:F-12:globus-ftp-client-5.2-1.fc12.src.rpm:1265704452


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-ftp-client/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	4 Jun 2009 03:57:21 -0000	1.2
+++ sources	9 Feb 2010 08:34:28 -0000	1.3
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-74293005cf65816798e503e4c2e6566d  globus_ftp_client-3.14.tar.gz
+00b8afc53457b8eb936296853859a74f  globus_ftp_client-5.2.tar.gz



More information about the scm-commits mailing list