rpms/globus-ftp-control/F-12 .cvsignore, 1.2, 1.3 globus-ftp-control-doxygen.patch, 1.1, 1.2 globus-ftp-control.spec, 1.3, 1.4 import.log, 1.2, 1.3 sources, 1.2, 1.3 globus-ftp-control.patch, 1.1, NONE
Mattias Ellert
ellert at fedoraproject.org
Tue Feb 9 08:31:03 UTC 2010
- Previous message: rpms/globus-ftp-control/devel .cvsignore, 1.2, 1.3 globus-ftp-control-doxygen.patch, 1.1, 1.2 globus-ftp-control.spec, 1.3, 1.4 import.log, 1.2, 1.3 sources, 1.2, 1.3 globus-ftp-control.patch, 1.1, NONE
- Next message: rpms/globus-ftp-control/F-11 .cvsignore, 1.2, 1.3 globus-ftp-control-doxygen.patch, 1.1, 1.2 globus-ftp-control.spec, 1.3, 1.4 import.log, 1.2, 1.3 sources, 1.2, 1.3 globus-ftp-control.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ellert
Update of /cvs/pkgs/rpms/globus-ftp-control/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20352/F-12
Modified Files:
.cvsignore globus-ftp-control-doxygen.patch
globus-ftp-control.spec import.log sources
Removed Files:
globus-ftp-control.patch
Log Message:
* Sat Jan 23 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.11-1
- Update to Globus Toolkit 5.0.0
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-ftp-control/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 1 Jun 2009 05:09:29 -0000 1.2
+++ .cvsignore 9 Feb 2010 08:31:02 -0000 1.3
@@ -1,2 +1,2 @@
epstopdf-2.9.5gw
-globus_ftp_control-2.10.tar.gz
+globus_ftp_control-2.11.tar.gz
globus-ftp-control-doxygen.patch:
globus_ftp_control_data.c | 45 +++++++++++++++++----------------
globus_ftp_control_server.c | 4 +-
globus_gridftp_protocol_extensions.doc | 34 ++++++++++++------------
3 files changed, 43 insertions(+), 40 deletions(-)
Index: globus-ftp-control-doxygen.patch
===================================================================
RCS file: /cvs/pkgs/rpms/globus-ftp-control/F-12/globus-ftp-control-doxygen.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- globus-ftp-control-doxygen.patch 1 Jun 2009 05:09:29 -0000 1.1
+++ globus-ftp-control-doxygen.patch 9 Feb 2010 08:31:02 -0000 1.2
@@ -1,6 +1,6 @@
-diff -ur globus_ftp_control-2.10.orig/globus_ftp_control_data.c globus_ftp_control-2.10/globus_ftp_control_data.c
---- globus_ftp_control-2.10.orig/globus_ftp_control_data.c 2008-10-02 05:46:49.000000000 +0200
-+++ globus_ftp_control-2.10/globus_ftp_control_data.c 2009-04-05 13:20:01.000000000 +0200
+diff -ur globus_ftp_control-2.11.orig/globus_ftp_control_data.c globus_ftp_control-2.11/globus_ftp_control_data.c
+--- globus_ftp_control-2.11.orig/globus_ftp_control_data.c 2009-11-05 23:45:21.000000000 +0100
++++ globus_ftp_control-2.11/globus_ftp_control_data.c 2010-01-23 08:25:24.688529983 +0100
@@ -1000,6 +1000,13 @@
* @param handle
* A pointer to a FTP control handle which is configured to
@@ -82,7 +82,7 @@ diff -ur globus_ftp_control-2.10.orig/gl
* A integer identifying the stripe for which to return the
* number of channels. In the case of non-striped transfer this
* parameter should be zero.
-@@ -3436,13 +3437,13 @@
+@@ -3449,13 +3450,13 @@
/**
@@ -99,7 +99,7 @@ diff -ur globus_ftp_control-2.10.orig/gl
*
*/
globus_result_t
-@@ -3633,7 +3634,8 @@
+@@ -3646,7 +3647,8 @@
* @param dcau
* A parameter specifying the data channel authentication
* mode. Possible values are No Authentication, Self
@@ -109,7 +109,7 @@ diff -ur globus_ftp_control-2.10.orig/gl
globus_result_t
globus_ftp_control_local_dcau(
globus_ftp_control_handle_t * handle,
-@@ -5414,6 +5416,8 @@
+@@ -5427,6 +5429,8 @@
* user calls globus_ftp_control_release_data_info(). The callback
* is passed all of the arguments passed to this function with the
* exception of data_info.
@@ -118,7 +118,7 @@ diff -ur globus_ftp_control-2.10.orig/gl
*/
globus_result_t
globus_ftp_control_create_data_info(
-@@ -5605,11 +5609,10 @@
+@@ -5618,11 +5622,10 @@
* @param stripe_ndx
* The index of the stripe on which the data will be sent. The index
* of each stripe is determined by the call to local_spas or local_spor.
@@ -134,9 +134,18 @@ diff -ur globus_ftp_control-2.10.orig/gl
*/
globus_result_t
globus_ftp_control_data_write_stripe(
-diff -ur globus_ftp_control-2.10.orig/globus_ftp_control_server.c globus_ftp_control-2.10/globus_ftp_control_server.c
---- globus_ftp_control-2.10.orig/globus_ftp_control_server.c 2008-10-02 05:46:49.000000000 +0200
-+++ globus_ftp_control-2.10/globus_ftp_control_server.c 2009-04-05 13:20:01.000000000 +0200
+diff -ur globus_ftp_control-2.11.orig/globus_ftp_control_server.c globus_ftp_control-2.11/globus_ftp_control_server.c
+--- globus_ftp_control-2.11.orig/globus_ftp_control_server.c 2008-09-19 06:46:59.000000000 +0200
++++ globus_ftp_control-2.11/globus_ftp_control_server.c 2010-01-23 08:26:40.861279641 +0100
+@@ -451,7 +451,7 @@
+ * client. The command structure is used as a convience to determine
+ * what command the client issued. This function parses a command
+ * string sent by a client and populates the command argument
+- * appropriatly. In the GSSAPI case it will also decode and unwrap
++ * appropriately. In the GSSAPI case it will also decode and unwrap
+ * the command before parsing it.
+ *
+ * @param command
@@ -792,7 +792,7 @@
* @param callback
* The user callback that will be called when the server
@@ -146,9 +155,9 @@ diff -ur globus_ftp_control-2.10.orig/gl
* The user argument that is passed into callback.
*/
-diff -ur globus_ftp_control-2.10.orig/globus_gridftp_protocol_extensions.doc globus_ftp_control-2.10/globus_gridftp_protocol_extensions.doc
---- globus_ftp_control-2.10.orig/globus_gridftp_protocol_extensions.doc 2002-04-15 09:02:09.000000000 +0200
-+++ globus_ftp_control-2.10/globus_gridftp_protocol_extensions.doc 2009-04-05 13:23:19.000000000 +0200
+diff -ur globus_ftp_control-2.11.orig/globus_gridftp_protocol_extensions.doc globus_ftp_control-2.11/globus_gridftp_protocol_extensions.doc
+--- globus_ftp_control-2.11.orig/globus_gridftp_protocol_extensions.doc 2002-04-15 09:02:09.000000000 +0200
++++ globus_ftp_control-2.11/globus_gridftp_protocol_extensions.doc 2010-01-23 08:26:00.137281403 +0100
@@ -1,8 +1,8 @@
/**
@anchor page_extensions
@@ -241,6 +250,15 @@ diff -ur globus_ftp_control-2.10.orig/gl
The striped and parallel data transfer methods described above require
an extended transfer mode to support out-of-sequence data delivery,
and partial data transmission per data connection. The extended block
+@@ -462,7 +462,7 @@
+ The 126 is an intermediate response to RETR command. It has the following
+ format.
+
+-"126" <SP> 1*(count of data connections)
++126 <SP> 1*(count of data connections)
+
+ Several "Count of data connections" can be in a single reply. They
+ correspond to the stripes returned in the response to the SPAS command.
@@ -587,7 +587,7 @@
at the given timestamp. The meaning of the facts are
Index: globus-ftp-control.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-ftp-control/F-12/globus-ftp-control.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- globus-ftp-control.spec 25 Jul 2009 07:28:16 -0000 1.3
+++ globus-ftp-control.spec 9 Feb 2010 08:31:02 -0000 1.4
@@ -6,35 +6,32 @@
Name: globus-ftp-control
%global _name %(tr - _ <<< %{name})
-Version: 2.10
-Release: 3%{?dist}
-Summary: Globus Toolkit - GridFTP Client Control Library
+Version: 2.11
+Release: 1%{?dist}
+Summary: Globus Toolkit - GridFTP Control 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/control/source globus_ftp_control-2.10
-# cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_ftp_control-2.10
-# tar -zcf globus_ftp_control-2.10.tar.gz globus_ftp_control-2.10
+# 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/control/source globus_ftp_control-2.11
+# cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_ftp_control-2.11
+# tar -zcf globus_ftp_control-2.11.tar.gz globus_ftp_control-2.11
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
Source9: epstopdf-2.9.5gw
-# Make package descriptions unique:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6589
-Patch0: %{name}.patch
# Remove some doxygen warnings:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6590
-Patch1: %{name}-doxygen.patch
+Patch0: %{name}-doxygen.patch
# Dereferencing of type-punned pointers:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6603
-Patch2: %{name}-type-punned-pointer.patch
+Patch1: %{name}-type-punned-pointer.patch
# Fix format errors:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6749
-Patch3: %{name}-format.patch
+Patch2: %{name}-format.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: globus-common
@@ -57,7 +54,7 @@ BuildRequires: tetex-latex
%endif
%package devel
-Summary: Globus Toolkit - GridFTP Client Control Library Development Files
+Summary: Globus Toolkit - GridFTP Control Library Development Files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: globus-common-devel%{?_isa} >= 3
@@ -67,7 +64,7 @@ Requires: globus-gssapi-gsi-devel%{?_isa
Requires: globus-core%{?_isa} >= 4
%package doc
-Summary: Globus Toolkit - GridFTP Client Control Library Documentation Files
+Summary: Globus Toolkit - GridFTP Control Library Documentation Files
Group: Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch: noarch
@@ -81,7 +78,7 @@ many others all over the world. A growin
using the Globus Toolkit to unlock the potential of grids for their cause.
The %{name} package contains:
-GridFTP Client Control Library
+GridFTP Control Library
%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
@@ -90,7 +87,7 @@ many others all over the world. A growin
using the Globus Toolkit to unlock the potential of grids for their cause.
The %{name}-devel package contains:
-GridFTP Client Control Library Development Files
+GridFTP Control Library Development Files
%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
@@ -99,14 +96,13 @@ many others all over the world. A growin
using the Globus Toolkit to unlock the potential of grids for their cause.
The %{name}-doc package contains:
-GridFTP Client Control Library Documentation Files
+GridFTP Control Library Documentation Files
%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%if "%{rhel}" == "5"
mkdir bin
@@ -214,6 +210,9 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_docdir}/%{name}-%{version}/html
%changelog
+* Sat Jan 23 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.11-1
+- Update to Globus Toolkit 5.0.0
+
* Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.10-3
- Add instruction set architecture (isa) tags
- Make doc subpackage noarch
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-ftp-control/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:14:32 -0000 1.2
+++ import.log 9 Feb 2010 08:31:03 -0000 1.3
@@ -1,2 +1,3 @@
globus-ftp-control-2_10-1_fc9:HEAD:globus-ftp-control-2.10-1.fc9.src.rpm:1243832936
globus-ftp-control-2_10-2_fc9:HEAD:globus-ftp-control-2.10-2.fc9.src.rpm:1245093251
+globus-ftp-control-2_11-1_fc12:F-12:globus-ftp-control-2.11-1.fc12.src.rpm:1265704246
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-ftp-control/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 1 Jun 2009 05:09:29 -0000 1.2
+++ sources 9 Feb 2010 08:31:03 -0000 1.3
@@ -1,2 +1,2 @@
44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw
-f48e8e547f1257cc9fcd0e98018d2942 globus_ftp_control-2.10.tar.gz
+af1f932952c99fde4957fe6992b98e86 globus_ftp_control-2.11.tar.gz
--- globus-ftp-control.patch DELETED ---
- Previous message: rpms/globus-ftp-control/devel .cvsignore, 1.2, 1.3 globus-ftp-control-doxygen.patch, 1.1, 1.2 globus-ftp-control.spec, 1.3, 1.4 import.log, 1.2, 1.3 sources, 1.2, 1.3 globus-ftp-control.patch, 1.1, NONE
- Next message: rpms/globus-ftp-control/F-11 .cvsignore, 1.2, 1.3 globus-ftp-control-doxygen.patch, 1.1, 1.2 globus-ftp-control.spec, 1.3, 1.4 import.log, 1.2, 1.3 sources, 1.2, 1.3 globus-ftp-control.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list