rpms/globus-gssapi-gsi/F-9 globus-gssapi-gsi-doxygen.patch, NONE, 1.1 globus-gssapi-gsi-labels.patch, NONE, 1.1 globus-gssapi-gsi-sslinit.patch, NONE, 1.1 globus-gssapi-gsi-type-punned-pointer.patch, NONE, 1.1 globus-gssapi-gsi.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Mattias Ellert ellert at fedoraproject.org
Tue May 19 05:21:25 UTC 2009


Author: ellert

Update of /cvs/pkgs/rpms/globus-gssapi-gsi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3871/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	globus-gssapi-gsi-doxygen.patch globus-gssapi-gsi-labels.patch 
	globus-gssapi-gsi-sslinit.patch 
	globus-gssapi-gsi-type-punned-pointer.patch 
	globus-gssapi-gsi.spec import.log 
Log Message:
* Tue May 12 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.9-2
- Change the License tag to take the library/ssl_locl.h file into account


globus-gssapi-gsi-doxygen.patch:

--- NEW FILE globus-gssapi-gsi-doxygen.patch ---
diff -ur globus_gssapi_gsi-5.9.orig/library/gssapi.h globus_gssapi_gsi-5.9/library/gssapi.h
--- globus_gssapi_gsi-5.9.orig/library/gssapi.h	2006-01-19 06:56:09.000000000 +0100
+++ globus_gssapi_gsi-5.9/library/gssapi.h	2008-10-15 18:31:12.000000000 +0200
@@ -265,7 +265,6 @@
  * @deprecated We now accept proxies signed by limited proxies if
  * they are limited or independent.
  */
-/* @{ */
 #define GSS_C_GLOBUS_ACCEPT_PROXY_SIGNED_BY_LIMITED_PROXY_FLAG 32768
 /* @} */
  
diff -ur globus_gssapi_gsi-5.9.orig/library/inquire_cred.c globus_gssapi_gsi-5.9/library/inquire_cred.c
--- globus_gssapi_gsi-5.9.orig/library/inquire_cred.c	2006-01-19 06:56:09.000000000 +0100
+++ globus_gssapi_gsi-5.9/library/inquire_cred.c	2008-10-15 18:36:43.000000000 +0200
@@ -62,7 +62,7 @@
  * @param name
  * @param lifetime
  * @param cred_usage
- * @param machanisms
+ * @param mechanisms
  *
  * @return
  */
diff -ur globus_gssapi_gsi-5.9.orig/library/wrap.c globus_gssapi_gsi-5.9/library/wrap.c
--- globus_gssapi_gsi-5.9.orig/library/wrap.c	2008-01-14 16:58:52.000000000 +0100
+++ globus_gssapi_gsi-5.9/library/wrap.c	2008-10-15 18:37:20.000000000 +0200
@@ -44,7 +44,7 @@
  * 
  * @param minor_status
  * @param context_handle
- * @param conf_req_flags
+ * @param conf_req_flag
  * @param qop_req
  * @param req_output_size
  * @param max_input_size

globus-gssapi-gsi-labels.patch:

--- NEW FILE globus-gssapi-gsi-labels.patch ---
diff -Nur globus_gssapi_gsi-5.9.orig/configure.in globus_gssapi_gsi-5.9/configure.in
--- globus_gssapi_gsi-5.9.orig/configure.in	2002-08-17 09:23:14.000000000 +0200
+++ globus_gssapi_gsi-5.9/configure.in	2008-10-15 17:59:59.000000000 +0200
@@ -12,6 +12,17 @@
 dnl Initialize the automake rules the last argument
 AM_INIT_AUTOMAKE($GPT_NAME, $GPT_VERSION, 0)
 
+case "$GLOBUS_HOST" in
+*-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu)
+    use_symbol_labels="yes"
+    ;;
+*)
+    use_symbol_labels="no"
+    ;;
+esac
+
+AM_CONDITIONAL(USE_SYMBOL_LABELS, test x$use_symbol_labels = "xyes")
+
 GLOBUS_FINALIZE
 
 LAC_DOXYGEN(["../library"])
diff -Nur globus_gssapi_gsi-5.9.orig/library/gssapi.sym globus_gssapi_gsi-5.9/library/gssapi.sym
--- globus_gssapi_gsi-5.9.orig/library/gssapi.sym	1970-01-01 01:00:00.000000000 +0100
+++ globus_gssapi_gsi-5.9/library/gssapi.sym	2008-10-15 17:49:34.000000000 +0200
@@ -0,0 +1,69 @@
+globus_gssapi_gsi {
+	gss_acquire_cred;
+	gss_release_cred;
+	gss_init_sec_context;
+	gss_accept_sec_context;
+	gss_process_context_token;
+	gss_delete_sec_context;
+	gss_context_time;
+	gss_get_mic;
+	gss_verify_mic;
+	gss_wrap;
+	gss_unwrap;
+	gss_display_status;
+	gss_indicate_mechs;
+	gss_compare_name;
+	gss_display_name;
+	gss_import_name;
+	gss_export_name;
+	gss_release_name;
+	gss_release_buffer;
+	gss_release_oid_set;
+	gss_inquire_cred;
+	gss_inquire_context;
+	gss_wrap_size_limit;
+	gss_add_cred;
+	gss_inquire_cred_by_mech;
+	gss_export_sec_context;
+	gss_import_sec_context;
+	gss_create_empty_oid_set;
+	gss_add_oid_set_member;
+	gss_test_oid_set_member;
+	gss_inquire_names_for_mech;
+	gss_inquire_mechs_for_name;
+	gss_canonicalize_name;
+	gss_duplicate_name;
+	gss_sign;
+	gss_verify;
+	gss_seal;
+	gss_unseal;
+	gss_create_empty_buffer_set;
+	gss_add_buffer_set_member;
+	gss_release_buffer_set;
+	gss_import_cred;
+	gss_export_cred;
+	gss_init_delegation;
+	gss_accept_delegation;
+	gss_inquire_sec_context_by_oid;
+	gss_inquire_cred_by_oid;
+	gss_set_sec_context_option;
+	gss_set_group;
+	gss_get_group;
+	GSS_C_NT_USER_NAME;
+	GSS_C_NT_MACHINE_UID_NAME;
+	GSS_C_NT_STRING_UID_NAME;
+	GSS_C_NT_HOSTBASED_SERVICE_X;
+	GSS_C_NT_HOSTBASED_SERVICE;
+	GSS_C_NT_ANONYMOUS;
+	GSS_C_NT_EXPORT_NAME;
+	GSS_DISALLOW_ENCRYPTION;
+	GSS_PROTECTION_FAIL_ON_CONTEXT_EXPIRATION;
+	GSS_APPLICATION_WILL_HANDLE_EXTENSIONS;
+	gss_nt_user_name;
+	gss_nt_machine_uid_name;
+	gss_nt_string_uid_name;
+	gss_nt_service_name;
+	gss_ext_x509_cert_chain_oid;
+	gss_mech_globus_gssapi_openssl;
+	gss_proxycertinfo_extension;
+};
diff -Nur globus_gssapi_gsi-5.9.orig/library/Makefile.am globus_gssapi_gsi-5.9/library/Makefile.am
--- globus_gssapi_gsi-5.9.orig/library/Makefile.am	2008-09-18 22:23:21.000000000 +0200
+++ globus_gssapi_gsi-5.9/library/Makefile.am	2008-10-15 17:52:38.000000000 +0200
@@ -51,6 +51,11 @@
 flavorinclude_HEADERS = \
 	gssapi.h
 
+if USE_SYMBOL_LABELS
+LABELFLAGS = -Wl,--version-script,gssapi.sym
+else
+LABELFLAGS =
+endif
 
 #AM_CFLAGS = -DDEBUG
 
@@ -61,6 +66,9 @@
 libglobus_gssapi_gsi___GLOBUS_FLAVOR_NAME__la_SOURCES = $(Sources)
 
 libglobus_gssapi_gsi___GLOBUS_FLAVOR_NAME__la_LIBADD = $(GPT_LIB_LINKS)
-libglobus_gssapi_gsi___GLOBUS_FLAVOR_NAME__la_LDFLAGS = $(GPT_LDFLAGS)
+libglobus_gssapi_gsi___GLOBUS_FLAVOR_NAME__la_LDFLAGS = $(GPT_LDFLAGS) \
+	$(LABELFLAGS)
+
+EXTRA_DIST = gssapi.sym
 
 include $(top_srcdir)/globus_automake_post

globus-gssapi-gsi-sslinit.patch:

--- NEW FILE globus-gssapi-gsi-sslinit.patch ---
diff -ur globus_gssapi_gsi-4.14.orig/library/globus_i_gsi_gss_utils.c globus_gssapi_gsi-4.14/library/globus_i_gsi_gss_utils.c
--- globus_gssapi_gsi-4.14.orig/library/globus_i_gsi_gss_utils.c	2008-02-13 22:26:39.000000000 +0100
+++ globus_gssapi_gsi-4.14/library/globus_i_gsi_gss_utils.c	2008-10-24 11:10:04.000000000 +0200
@@ -2080,14 +2080,6 @@
         goto exit;
     }
 
-    /*
-     * post-0.9.8 versions of the SSL library seem to move part of the 
-     * cipher setup code into SSL_library_init(). Without this call, the
-     * SSL_CTX_new routine comaplains at not being able to initialize the 
-     * list of ciphers.
-     */
-    SSL_library_init();
-
 #if (OPENSSL_VERSION_NUMBER >= 0x00908000L) && !defined(OPENSSL_NO_COMP)
     /*
      * post-0.9.8 versions of OpenSSL include data compression. unfortunately,

globus-gssapi-gsi-type-punned-pointer.patch:

--- NEW FILE globus-gssapi-gsi-type-punned-pointer.patch ---
diff -ur globus_gssapi_gsi-5.9.orig/library/globus_i_gsi_gss_utils.c globus_gssapi_gsi-5.9/library/globus_i_gsi_gss_utils.c
--- globus_gssapi_gsi-5.9.orig/library/globus_i_gsi_gss_utils.c	2008-09-24 22:26:34.000000000 +0200
+++ globus_gssapi_gsi-5.9/library/globus_i_gsi_gss_utils.c	2008-12-30 20:46:43.000000000 +0100
@@ -2475,7 +2475,7 @@
     
     local_result = globus_gsi_callback_get_extension_oids(
         callback_data,
-        (void **) &extension_oids);
+        (void **) (void *) &extension_oids);
 
     if(local_result != GLOBUS_SUCCESS)
     {


--- NEW FILE globus-gssapi-gsi.spec ---
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
%global flavor gcc64pthr
%else
%global flavor gcc32pthr
%endif

Name:		globus-gssapi-gsi
%global _name %(tr - _ <<< %{name})
Version:	5.9
Release:	2%{?dist}
Summary:	Globus Toolkit - GSSAPI library

Group:		System Environment/Libraries
#		The library/ssl_locl.h file is licensed under OpenSSL license
#		The rest is licenced under Apache 2.0 license
License:	ASL 2.0 and OpenSSL
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/gsi/gssapi/source globus_gssapi_gsi-5.9
#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gssapi_gsi-5.9
#		tar -zcf globus_gssapi_gsi-5.9.tar.gz globus_gssapi_gsi-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
Source9:	epstopdf-2.9.5gw
#		Use versioned symbols for GSSAPI functions (like kerberos):
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6415
#		http://bugzilla.nordugrid.org/show_bug.cgi?id=1106
Patch0:		%{name}-labels.patch
#		Fix some doxygen warnings:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6479
Patch1:		%{name}-doxygen.patch
#		SSL_library_init not threadsafe:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6510
Patch2:		%{name}-sslinit.patch
#		Dereferencing of type-punned pointers:
#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6604
Patch3:		%{name}-type-punned-pointer.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:	globus-openssl >= 1
BuildRequires:	grid-packaging-tools
BuildRequires:	globus-gsi-credential-devel >= 1
BuildRequires:	globus-gsi-callback-devel
BuildRequires:	globus-openssl-module-devel
BuildRequires:	globus-gsi-openssl-error-devel
BuildRequires:	globus-openssl-devel >= 1
BuildRequires:	globus-gsi-proxy-core-devel >= 1
BuildRequires:	globus-core >= 4
BuildRequires:	globus-gsi-cert-utils-devel >= 5
BuildRequires:	globus-common-devel >= 3
BuildRequires:	doxygen
%if %{?fedora}%{!?fedora:0} >= 3
BuildRequires:	graphviz
BuildRequires:	ghostscript
%else
%if %{?rhel}%{!?rhel:0} >= 5
BuildRequires:	graphviz
BuildRequires:	ghostscript
%if "%{?rhel}" == "5"
BuildRequires:	graphviz-gd
%endif
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 9
BuildRequires:	tex(latex)
%else
%if %{?rhel}%{!?rhel:0} >= 6
BuildRequires:	tex(latex)
%else
BuildRequires:	tetex-latex
%endif
%endif

%package devel
Summary:	Globus Toolkit - GSSAPI library Development Files
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	globus-gsi-credential-devel >= 1
Requires:	globus-gsi-callback-devel
Requires:	globus-openssl-module-devel
Requires:	globus-gsi-openssl-error-devel
Requires:	globus-openssl-devel >= 1
Requires:	globus-gsi-proxy-core-devel >= 1
Requires:	globus-core >= 4
Requires:	globus-gsi-cert-utils-devel >= 5
Requires:	globus-common-devel >= 3

%package doc
Summary:	Globus Toolkit - GSSAPI library Documentation Files
Group:		Documentation
Requires:	%{name} = %{version}-%{release}

%description
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name} package contains:
GSSAPI library

%description devel
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-devel package contains:
GSSAPI library Development Files

%description doc
The Globus Toolkit is an open source software toolkit used for building Grid
systems and applications. It is being developed by the Globus Alliance and
many others all over the world. A growing number of projects and companies are
using the Globus Toolkit to unlock the potential of grids for their cause.

The %{name}-doc package contains:
GSSAPI library Documentation Files

%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1

%if "%{rhel}" == "5"
mkdir bin
install %{SOURCE9} bin/epstopdf
%endif

%build
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
rm -f pkgdata/Makefile.am
rm -f globus_automake*
rm -rf autom4te.cache

# Remove flavor tags
for f in `find . -name Makefile.am` ; do
  sed -e 's!^flavorinclude_HEADERS!include_HEADERS!' \
      -e 's!\(lib[a-zA-Z_]*\)_$(GLOBUS_FLAVOR_NAME)\.la!\1.la!g' \
      -e 's!^\(lib[a-zA-Z_]*\)___GLOBUS_FLAVOR_NAME__la_!\1_la_!' -i $f
done
sed -e "s!<With_Flavors!<With_Flavors ColocateLibraries=\"no\"!" \
  -i pkgdata/pkg_data_src.gpt.in

%{_datadir}/globus/globus-bootstrap.sh

%configure --with-flavor=%{flavor} --enable-doxygen

make %{?_smp_mflags}

%install
%if "%{rhel}" == "5"
export PATH=$PWD/bin:$PATH
%endif

rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
sed '/lib.*\.la$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist

# Remove static libraries (.a files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
sed '/lib.*\.a$/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist

# Generate pkg-config file from GPT metadata
mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
%{_datadir}/globus/globus-gpt2pkg-config pkgdata/pkg_data_%{flavor}_dev.gpt > \
  $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc

# Move documentation to default RPM location
mv $RPM_BUILD_ROOT%{_docdir}/%{_name} \
  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
sed s!doc/%{_name}!doc/%{name}-%{version}! \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Remove unwanted documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
sed -e '/deprecated\.3/d' \
    -e '/_%{_name}-%{version}_.*\.3/d' \
  -i $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist

# Install license file
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 -p GLOBUS_LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

# Generate package filelists
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_rtl.filelist \
  | sed s!^!%{_prefix}! > package.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/%{flavor}_dev.filelist \
  | sed s!^!%{_prefix}! > package-devel.filelist
cat $RPM_BUILD_ROOT%{_datadir}/globus/packages/%{_name}/noflavor_doc.filelist \
  | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f package.filelist
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE

%files -f package-devel.filelist devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/%{name}.pc

%files -f package-doc.filelist doc
%defattr(-,root,root,-)
%dir %{_docdir}/%{name}-%{version}/html

%changelog
* Tue May 12 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.9-2
- Change the License tag to take the library/ssl_locl.h file into account

* Thu Apr 16 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.9-1
- Make comment about source retrieval more explicit
- Change defines to globals
- Remove explicit requires on library packages
- Put GLOBUS_LICENSE file in extracted source tarball

* Sun Mar 15 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.9-0.5
- Adapting to updated globus-core package

* Thu Feb 26 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.9-0.4
- Add s390x to the list of 64 bit platforms

* Thu Jan  1 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.9-0.3
- Adapt to updated GPT package

* Wed Oct 15 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.9-0.2
- Update to Globus Toolkit 4.2.1

* Mon Jul 14 2008 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.3-0.1
- Autogenerated


--- NEW FILE import.log ---
globus-gssapi-gsi-5_9-2_fc9:F-9:globus-gssapi-gsi-5.9-2.fc9.src.rpm:1242710414


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gssapi-gsi/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	18 May 2009 23:41:50 -0000	1.1
+++ .cvsignore	19 May 2009 05:20:53 -0000	1.2
@@ -0,0 +1,2 @@
+epstopdf-2.9.5gw
+globus_gssapi_gsi-5.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gssapi-gsi/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	18 May 2009 23:41:50 -0000	1.1
+++ sources	19 May 2009 05:20:54 -0000	1.2
@@ -0,0 +1,2 @@
+44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
+a95da38d6d1eae9caf84ffd7bd1d6a68  globus_gssapi_gsi-5.9.tar.gz




More information about the fedora-extras-commits mailing list