[globus-gss-assist] Update to Globus Toolkit 5.0.4 Fix doxygen markup
Mattias Ellert
ellert at fedoraproject.org
Tue Jun 7 13:31:11 UTC 2011
commit 7d830f59661eb133a249d87a1bffb31f082d1cf3
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Mon Jun 6 09:05:08 2011 +0200
Update to Globus Toolkit 5.0.4
Fix doxygen markup
.gitignore | 4 +-
globus-gss-assist-doxygen.patch | 125 +++++++++++++++++++++++++++++++++++++++
globus-gss-assist.spec | 22 +++++--
sources | 2 +-
4 files changed, 143 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a893fa0..ad03908 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-epstopdf-2.9.5gw
-globus_gss_assist-5.9.tar.gz
+/epstopdf-2.9.5gw
+/globus_gss_assist-5.10.tar.gz
diff --git a/globus-gss-assist-doxygen.patch b/globus-gss-assist-doxygen.patch
new file mode 100644
index 0000000..4e7d844
--- /dev/null
+++ b/globus-gss-assist-doxygen.patch
@@ -0,0 +1,125 @@
+diff -ur globus_gss_assist-5.10.orig/gridmap.c globus_gss_assist-5.10/gridmap.c
+--- globus_gss_assist-5.10.orig/gridmap.c 2011-04-22 20:16:46.000000000 +0200
++++ globus_gss_assist-5.10/gridmap.c 2011-06-05 01:52:18.645634168 +0200
+@@ -128,7 +128,7 @@
+ * If successful, the caller is responsible for freeing the string pointed
+ * to by @a useridp.
+ *
+- * By default, @a globus_gss_assist_gridmap() looks for the default gridmap
++ * By default, globus_gss_assist_gridmap() looks for the default gridmap
+ * file defined by the value of the GRIDMAP environment variable. If that
+ * is not set, it falls back to $HOME/.gridmap.
+ *
+@@ -257,12 +257,12 @@
+ * @ingroup globus_gsi_gss_assist
+ *
+ * @details
+- * The @a globus_gss_assist_userok() function parses the default gridmap file
++ * The globus_gss_assist_userok() function parses the default gridmap file
+ * and checks whether any mapping exists for the grid identity passed as the
+ * @a globusid parameter and the local user identity passed as the @ userid
+ * parameter.
+ *
+- * By default, @a globus_gss_assist_userok() looks for the default gridmap
++ * By default, globus_gss_assist_userok() looks for the default gridmap
+ * file defined by the value of the GRIDMAP environment variable. If that
+ * is not set, it falls back to $HOME/.gridmap.
+ *
+@@ -272,7 +272,7 @@
+ * The local account name that access is sought for.
+ *
+ * @return
+- * If @a globus_gss_assist_userok() is able to find a mapping between
++ * If globus_gss_assist_userok() is able to find a mapping between
+ * @a globusid and @a userid, it returns 0; otherwise it returns 1.
+ *
+ * @retval GLOBUS_SUCCESS
+@@ -380,7 +380,7 @@
+ * @ingroup globus_gsi_gss_assist
+ *
+ * @details
+- * The @a globus_gss_assist_map_local_user() function parses the
++ * The globus_gss_assist_map_local_user() function parses the
+ * gridmap file to determine a if the user name passed as the @a local_user
+ * parameter is the default local user for a Grid ID in the gridmap file. If
+ * so, it modifies @a globusidp to point to a copy of that ID. Otherwise, it
+@@ -389,7 +389,7 @@
+ * If successful, the caller is responsible for freeing the string pointed to
+ * by the @a globusidp pointer.
+ *
+- * By default, @a globus_gss_assist_map_local_user() looks for the default
++ * By default, globus_gss_assist_map_local_user() looks for the default
+ * gridmap file defined by the value of the GRIDMAP environment variable. If
+ * that is not set, it falls back to $HOME/.gridmap.
+ *
+@@ -399,9 +399,9 @@
+ * A Grid ID that maps from the local_user.
+ *
+ * @return
+- * On success, @a globus_gss_assist_map_local_user() returns 0 and
++ * On success, globus_gss_assist_map_local_user() returns 0 and
+ * modifies @a globusidp to point to a Grid ID that maps to @a local_user;
+- * otherwise, @a globus_gss_assist_map_local_user() returns 1 and the
++ * otherwise, globus_gss_assist_map_local_user() returns 1 and the
+ * value pointed to by @a globusidp is undefined.
+ *
+ * @retval GLOBUS_SUCCESS
+@@ -1358,7 +1358,7 @@
+ * @ingroup globus_gsi_gss_assist
+ *
+ * @details
+- * The @a globus_gss_assist_lookup_all_globusid() function parses a
++ * The globus_gss_assist_lookup_all_globusid() function parses a
+ * gridmap file and finds all Grid IDs that map to a local user ID.
+ * The @a dns parameter is modified to point to an array of Grid ID
+ * strings from the gridmap file, and the @a dn_count parameter is
+@@ -1366,7 +1366,7 @@
+ * The caller is responsible for freeing the array using the macro
+ * @a GlobusGssAssistFreeDNArray().
+ *
+- * By default, @a globus_gss_assist_lookup_all_globusid() looks for the default
++ * By default, globus_gss_assist_lookup_all_globusid() looks for the default
+ * gridmap file defined by the value of the GRIDMAP environment variable. If
+ * that is not set, it falls back to $HOME/.gridmap.
+ *
+@@ -1382,10 +1382,10 @@
+ * entries in the array returned via the @a dns parameter.
+ *
+ * @return
+- * On success, @a globus_gss_assist_lookup_all_globusid() returns
++ * On success, globus_gss_assist_lookup_all_globusid() returns
+ * GLOBUS_SUCCESS and modifies its @a dns and @a dn_count parameters as
+ * described above. If an error occurs,
+- * @a globus_gss_assist_lookup_all_globusid() returns a globus_result_t
++ * globus_gss_assist_lookup_all_globusid() returns a globus_result_t
+ * that can be resolved to an error object and the values
+ * pointed to by @a dns and @a dn_count are undefined.
+ *
+@@ -1552,12 +1552,12 @@
+ * value passed as the @a identity_buffer_length parameter.
+ *
+ * If authorization callouts are defined in the callout configuration
+- * file, @a globus_gss_assist_map_and_authorize() will invoke both the
++ * file, globus_gss_assist_map_and_authorize() will invoke both the
+ * GLOBUS_GENERIC_MAPPING_TYPE callout and the GLOBUS_GENERIC_AUTHZ_TYPE
+ * callout; otherwise the default gridmap file will be used for mapping
+ * and no service-specific authorization will be done.
+ *
+- * If @a globus_gss_assist_map_and_authorize() uses a gridmap file, it
++ * If globus_gss_assist_map_and_authorize() uses a gridmap file, it
+ * first looks for a file defined by the value of the GRIDMAP environment
+ * variable. If that is not set, it falls back to $HOME/.gridmap.
+ *
+@@ -1577,10 +1577,10 @@
+ * Length of the @a identity_buffer array.
+ *
+ * @return
+- * On success, @a globus_gss_assist_map_and_authorize() returns
++ * On success, globus_gss_assist_map_and_authorize() returns
+ * GLOBUS_SUCCESS and copies the authorized local identity to the
+ * @a identity_buffer parameter. If an error occurs,
+- * @a globus_gss_assist_map_and_authorize() returns a globus_result_t
++ * globus_gss_assist_map_and_authorize() returns a globus_result_t
+ * that can be resolved to an error object.
+ *
+ * @retval GLOBUS_SUCCESS
diff --git a/globus-gss-assist.spec b/globus-gss-assist.spec
index 4c4d203..9f0fe2f 100644
--- a/globus-gss-assist.spec
+++ b/globus-gss-assist.spec
@@ -6,19 +6,19 @@
Name: globus-gss-assist
%global _name %(tr - _ <<< %{name})
-Version: 5.9
-Release: 4%{?dist}
+Version: 5.10
+Release: 1%{?dist}
Summary: Globus Toolkit - GSSAPI Assist 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/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
+# wget -N http://www-unix.globus.org/ftppub/gt5/5.0/5.0.4/installers/src/gt5.0.4-all-source-installer.tar.bz2
+# tar -jxf gt5.0.4-all-source-installer.tar.bz2
+# mv gt5.0.4-all-source-installer/source-trees/gsi/gss_assist/source globus_gss_assist-5.10
+# cp -p gt5.0.4-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gss_assist-5.10
+# tar -zcf globus_gss_assist-5.10.tar.gz globus_gss_assist-5.10
Source: %{_name}-%{version}.tar.gz
# README file
Source8: GLOBUS-GSIC
@@ -32,6 +32,9 @@ Patch0: %{name}-gridmapdir.patch
# X509_NAME_oneline don't normalize DNs the same way:
# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=1417
Patch1: %{name}-normalization.patch
+# Fix doxygen markup
+# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=7185
+Patch2: %{name}-doxygen.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: globus-common
@@ -119,6 +122,7 @@ GSSAPI Assist library Documentation Files
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%if "%{rhel}" == "5"
mkdir bin
@@ -235,6 +239,10 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_docdir}/%{name}-%{version}/html
%changelog
+* Fri Jun 03 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.10-1
+- Update to Globus Toolkit 5.0.4
+- Fix doxygen markup
+
* Sun Apr 24 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.9-4
- Add README file
diff --git a/sources b/sources
index dd92a1f..50f4a3c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw
-66728ba4b2cd051dd31f492dfa59797c globus_gss_assist-5.9.tar.gz
+f497691313d93ffc33ca9d9f2f227bf4 globus_gss_assist-5.10.tar.gz
More information about the scm-commits
mailing list