From 1ff06b8d10eb05336ccf566fd80449ff62c912a8 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Jul 17 2010 17:38:59 +0000 Subject: - Update to Globus Toolkit 5.0.2 --- diff --git a/.cvsignore b/.cvsignore index 05b331b..43a7f94 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ epstopdf-2.9.5gw -globus_gass_copy-5.4.tar.gz +globus_gass_copy-5.7.tar.gz diff --git a/globus-gass-copy-mingw.patch b/globus-gass-copy-mingw.patch index 37b7004..7e26efc 100644 --- a/globus-gass-copy-mingw.patch +++ b/globus-gass-copy-mingw.patch @@ -1,7 +1,7 @@ -diff -ur globus_gass_copy-5.3.orig/globus_gass_copy_glob.c globus_gass_copy-5.3/globus_gass_copy_glob.c ---- globus_gass_copy-5.3.orig/globus_gass_copy_glob.c 2009-07-16 21:28:09.000000000 +0200 -+++ globus_gass_copy-5.3/globus_gass_copy_glob.c 2010-03-07 17:56:00.679553650 +0100 -@@ -1428,7 +1428,11 @@ +diff -ur globus_gass_copy-5.7.orig/globus_gass_copy_glob.c globus_gass_copy-5.7/globus_gass_copy_glob.c +--- globus_gass_copy-5.7.orig/globus_gass_copy_glob.c 2010-07-01 22:26:03.000000000 +0200 ++++ globus_gass_copy-5.7/globus_gass_copy_glob.c 2010-07-17 10:11:38.966555640 +0200 +@@ -1872,7 +1872,11 @@ goto error_null_path; } @@ -13,9 +13,9 @@ diff -ur globus_gass_copy-5.3.orig/globus_gass_copy_glob.c globus_gass_copy-5.3/ if(rc != 0) { -diff -ur globus_gass_copy-5.3.orig/globus_url_copy.c globus_gass_copy-5.3/globus_url_copy.c ---- globus_gass_copy-5.3.orig/globus_url_copy.c 2009-12-18 06:51:45.000000000 +0100 -+++ globus_gass_copy-5.3/globus_url_copy.c 2010-03-07 18:01:03.183300955 +0100 +diff -ur globus_gass_copy-5.7.orig/globus_url_copy.c globus_gass_copy-5.7/globus_url_copy.c +--- globus_gass_copy-5.7.orig/globus_url_copy.c 2010-07-13 21:11:50.000000000 +0200 ++++ globus_gass_copy-5.7/globus_url_copy.c 2010-07-17 10:22:02.861552734 +0200 @@ -48,6 +48,9 @@ */ #include "globus_io.h" @@ -26,7 +26,7 @@ diff -ur globus_gass_copy-5.3.orig/globus_url_copy.c globus_gass_copy-5.3/globus #define GUC_URL_ENC_CHAR "#;:=+ ," -@@ -1196,13 +1199,21 @@ +@@ -1281,6 +1284,9 @@ globus_l_guc_src_dst_pair_t * url_pair; FILE * dumpfile; char * dumptmp; @@ -36,19 +36,33 @@ diff -ur globus_gass_copy-5.3.orig/globus_url_copy.c globus_gass_copy-5.3/globus int dumpfd; int i; globus_l_guc_transfer_t * transfer_info; - - guc_info = (globus_l_guc_info_t *) user_arg; - dumptmp = globus_common_create_string("%s.XXXXXX", guc_info->dumpfile); +@@ -1292,7 +1298,12 @@ + if(guc_info->dumpfile) + { + dumptmp = globus_common_create_string("%s.XXXXXX", guc_info->dumpfile); +#ifdef WIN32 -+ dumptmp2 = mktemp(dumptmp); -+ dumpfd = open(dumptmp2, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); ++ dumptmp2 = mktemp(dumptmp); ++ dumpfd = open(dumptmp2, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); +#else - dumpfd = mkstemp(dumptmp); + dumpfd = mkstemp(dumptmp); +#endif - if(dumpfd < 0) + if(dumpfd < 0) + { + return; +@@ -1419,7 +1430,12 @@ + if(guc_info->dump_only_file) { - return; -@@ -1477,7 +1488,7 @@ + dumptmp = globus_common_create_string("%s.XXXXXX", guc_info->dump_only_file); ++#ifdef WIN32 ++ dumptmp2 = mktemp(dumptmp); ++ dumpfd = open(dumptmp2, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); ++#else + dumpfd = mkstemp(dumptmp); ++#endif + if(dumpfd < 0) + { + return; +@@ -1682,7 +1698,7 @@ int i; globus_callback_handle_t dumpfile_handle; diff --git a/globus-gass-copy.spec b/globus-gass-copy.spec index 68c4569..d49c1f2 100644 --- a/globus-gass-copy.spec +++ b/globus-gass-copy.spec @@ -6,7 +6,7 @@ Name: globus-gass-copy %global _name %(tr - _ <<< %{name}) -Version: 5.4 +Version: 5.7 Release: 1%{?dist} Summary: Globus Toolkit - Globus Gass Copy @@ -14,11 +14,11 @@ 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/gt5/5.0/5.0.1/installers/src/gt5.0.1-all-source-installer.tar.bz2 -# tar -jxf gt5.0.1-all-source-installer.tar.bz2 -# mv gt5.0.1-all-source-installer/source-trees/gass/copy/source globus_gass_copy-5.4 -# cp -p gt5.0.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gass_copy-5.4 -# tar -zcf globus_gass_copy-5.4.tar.gz globus_gass_copy-5.4 +# wget -N http://www-unix.globus.org/ftppub/gt5/5.0/5.0.2/installers/src/gt5.0.2-all-source-installer.tar.bz2 +# tar -jxf gt5.0.2-all-source-installer.tar.bz2 +# mv gt5.0.2-all-source-installer/source-trees/gass/copy/source globus_gass_copy-5.7 +# cp -p gt5.0.2-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gass_copy-5.7 +# tar -zcf globus_gass_copy-5.7.tar.gz globus_gass_copy-5.7 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 @@ -227,6 +227,9 @@ rm -rf $RPM_BUILD_ROOT %dir %{_docdir}/%{name}-%{version}/html %changelog +* Sat Jul 17 2010 Mattias Ellert - 5.7-1 +- Update to Globus Toolkit 5.0.2 + * Wed Apr 14 2010 Mattias Ellert - 5.4-1 - Update to Globus Toolkit 5.0.1 diff --git a/import.log b/import.log index 945de63..b996a97 100644 --- a/import.log +++ b/import.log @@ -2,3 +2,4 @@ globus-gass-copy-4_14-1_fc9:HEAD:globus-gass-copy-4.14-1.fc9.src.rpm:1244257346 globus-gass-copy-4_14-2_fc9:HEAD:globus-gass-copy-4.14-2.fc9.src.rpm:1245097091 globus-gass-copy-5_3-1_fc12:F-12:globus-gass-copy-5.3-1.fc12.src.rpm:1265704833 globus-gass-copy-5_4-1_fc12:F-12:globus-gass-copy-5.4-1.fc12.src.rpm:1271431971 +globus-gass-copy-5_7-1_fc12:EL-6:globus-gass-copy-5.7-1.fc12.src.rpm:1279388323 diff --git a/sources b/sources index 344bb52..a22c782 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw -eec20b9eba6e6c40be9a8d5e1b361893 globus_gass_copy-5.4.tar.gz +342ee425e4d4ee866bb472d9c4b45f56 globus_gass_copy-5.7.tar.gz