From dd00938b517e48bf65241ad54194863b38f612a7 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Jul 17 2010 16:56:54 +0000 Subject: - Update to Globus Toolkit 5.0.2 --- diff --git a/.cvsignore b/.cvsignore index f81d5b5..a893fa0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ epstopdf-2.9.5gw -globus_gss_assist-5.8.tar.gz +globus_gss_assist-5.9.tar.gz diff --git a/globus-gss-assist-gridmapdir.patch b/globus-gss-assist-gridmapdir.patch index d6dfaf6..6d35ff8 100644 --- a/globus-gss-assist-gridmapdir.patch +++ b/globus-gss-assist-gridmapdir.patch @@ -1,6 +1,7 @@ ---- source-trees/gt2-cvs/gsi/gss_assist/source/gridmap.c 1 Nov 2007 04:04:46 -0000 1.19.4.3 -+++ source-trees/gt2-cvs/gsi/gss_assist/source/gridmap.c 30 Jan 2008 19:34:57 -0000 -@@ -107,6 +107,393 @@ +diff -ur globus_gss_assist-5.9.orig/gridmap.c globus_gss_assist-5.9/gridmap.c +--- globus_gss_assist-5.9.orig/gridmap.c 2010-03-29 22:05:53.000000000 +0200 ++++ globus_gss_assist-5.9/gridmap.c 2010-07-17 09:17:41.537803559 +0200 +@@ -117,6 +117,393 @@ #endif @@ -392,9 +393,9 @@ +******************************************************************************/ + /** - * @name Gridmap - */ -@@ -147,6 +534,8 @@ + * @brief Look up the default mapping for a Grid identity in a gridmap file + * @ingroup globus_gsi_gss_assist +@@ -157,6 +544,8 @@ globus_result_t result = GLOBUS_SUCCESS; globus_i_gss_assist_gridmap_line_t * gline = NULL; @@ -403,7 +404,7 @@ static char * _function_name_ = "globus_gss_assist_gridmap"; -@@ -203,6 +592,16 @@ +@@ -213,6 +602,16 @@ (_GASL("Duplicate string operation failed"))); goto exit; } @@ -420,7 +421,7 @@ } else { -@@ -314,6 +713,12 @@ +@@ -332,6 +731,12 @@ goto exit; } @@ -433,7 +434,7 @@ for (useridp = gline->user_ids; *useridp != NULL; useridp++) { if (strcmp(*useridp, userid) == 0) -@@ -480,7 +885,8 @@ +@@ -503,7 +908,8 @@ error_obj = globus_error_get(result); globus_object_free(error_obj); diff --git a/globus-gss-assist.spec b/globus-gss-assist.spec index 37eab81..18dba64 100644 --- a/globus-gss-assist.spec +++ b/globus-gss-assist.spec @@ -6,7 +6,7 @@ Name: globus-gss-assist %global _name %(tr - _ <<< %{name}) -Version: 5.8 +Version: 5.9 Release: 1%{?dist} Summary: Globus Toolkit - GSSAPI Assist library @@ -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/gsi/gss_assist/source globus_gss_assist-5.8 -# cp -p gt5.0.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gss_assist-5.8 -# tar -zcf globus_gss_assist-5.8.tar.gz globus_gss_assist-5.8 +# 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/gsi/gss_assist/source globus_gss_assist-5.9 +# cp -p gt5.0.2-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gss_assist-5.9 +# tar -zcf globus_gss_assist-5.9.tar.gz globus_gss_assist-5.9 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 @@ -115,7 +115,7 @@ GSSAPI Assist library Documentation Files %prep %setup -q -n %{_name}-%{version} -%patch0 -p5 +%patch0 -p1 %patch1 -p1 %if "%{rhel}" == "5" @@ -223,6 +223,9 @@ rm -rf $RPM_BUILD_ROOT %dir %{_docdir}/%{name}-%{version}/html %changelog +* Sat Jul 17 2010 Mattias Ellert - 5.9-1 +- Update to Globus Toolkit 5.0.2 + * Wed Apr 14 2010 Mattias Ellert - 5.8-1 - Update to Globus Toolkit 5.0.1 diff --git a/import.log b/import.log index 43c97bb..960d549 100644 --- a/import.log +++ b/import.log @@ -2,3 +2,4 @@ globus-gss-assist-4_0-1_fc9:HEAD:globus-gss-assist-4.0-1.fc9.src.rpm:1242801482 globus-gss-assist-4_0-2_fc9:HEAD:globus-gss-assist-4.0-2.fc9.src.rpm:1245087400 globus-gss-assist-5_5-1_fc12:HEAD:globus-gss-assist-5.5-1.fc12.src.rpm:1265702771 globus-gss-assist-5_8-1_fc12:HEAD:globus-gss-assist-5.8-1.fc12.src.rpm:1271430597 +globus-gss-assist-5_9-1_fc12:HEAD:globus-gss-assist-5.9-1.fc12.src.rpm:1279385708 diff --git a/sources b/sources index 64f9b9b..dd92a1f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw -7c735d99c9804aa11e048f6882a5d629 globus_gss_assist-5.8.tar.gz +66728ba4b2cd051dd31f492dfa59797c globus_gss_assist-5.9.tar.gz