[globus-gssapi-gsi/el4] Update to Globus Toolkit 5.2.0
Mattias Ellert
ellert at fedoraproject.org
Sun Jan 8 01:19:20 UTC 2012
commit 9f38624a7e27cb0af9f525aab39e33cd40df700b
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sat Jan 7 15:41:04 2012 +0100
Update to Globus Toolkit 5.2.0
.gitignore | 2 +-
GLOBUS-GSIC | 6 ++
globus-gssapi-gsi-deps.patch | 39 +++++++++++++
globus-gssapi-gsi-doxygen.patch | 69 +++++++++++++++++++++++
globus-gssapi-gsi-format.patch | 41 ++++++++++++++
globus-gssapi-gsi.spec | 116 ++++++++++++++++++---------------------
sources | 2 +-
7 files changed, 211 insertions(+), 64 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f12a935..943fe53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
/epstopdf-2.9.5gw
-/globus_gssapi_gsi-7.8.tar.gz
+/*.tar.gz
diff --git a/GLOBUS-GSIC b/GLOBUS-GSIC
index 35fe6ee..b972218 100644
--- a/GLOBUS-GSIC
+++ b/GLOBUS-GSIC
@@ -6,6 +6,9 @@ http://www.globus.org/toolkit/docs/latest-stable/security/gsic/
Admin Guide:
http://www.globus.org/toolkit/docs/latest-stable/security/gsic/admin/
+User's Guide
+http://www.globus.org/toolkit/docs/latest-stable/security/gsic/user/
+
Developer's Guide:
http://www.globus.org/toolkit/docs/latest-stable/security/gsic/developer/
@@ -20,3 +23,6 @@ http://www.globus.org/toolkit/docs/latest-stable/security/gsic/qp/
Migrating Guide:
http://www.globus.org/toolkit/docs/latest-stable/security/gsic/mig/
+
+Globus RPM packaging is supported by the Initiative for Globus in Europe:
+http://www.ige-project.eu/
diff --git a/globus-gssapi-gsi-deps.patch b/globus-gssapi-gsi-deps.patch
new file mode 100644
index 0000000..f15d5f0
--- /dev/null
+++ b/globus-gssapi-gsi-deps.patch
@@ -0,0 +1,39 @@
+diff -ur globus_gssapi_gsi-10.2.orig/configure.in globus_gssapi_gsi-10.2/configure.in
+--- globus_gssapi_gsi-10.2.orig/configure.in 2011-11-02 14:47:22.000000000 +0100
++++ globus_gssapi_gsi-10.2/configure.in 2011-12-27 21:02:20.579163894 +0100
+@@ -21,6 +21,8 @@
+ ;;
+ esac
+
++GLOBUS_OPENSSL
++
+ AC_MSG_CHECKING([if we can link with internal OpenSSL APIs])
+ oldlibs="$LIBS"
+ LIBS="$GPT_CONFIG_LIBS"
+diff -ur globus_gssapi_gsi-10.2.orig/pkgdata/pkg_data_src.gpt.in globus_gssapi_gsi-10.2/pkgdata/pkg_data_src.gpt.in
+--- globus_gssapi_gsi-10.2.orig/pkgdata/pkg_data_src.gpt.in 2011-11-02 14:47:23.000000000 +0100
++++ globus_gssapi_gsi-10.2/pkgdata/pkg_data_src.gpt.in 2011-12-27 21:00:43.479174130 +0100
+@@ -47,6 +47,11 @@
+ <Simple_Version Major="6"/>
+ </Version>
+ </Dependency>
++ <Dependency Name="globus_gsi_sysconfig">
++ <Version>
++ <Simple_Version Major="5"/>
++ </Version>
++ </Dependency>
+ </Source_Dependencies>
+ <Source_Dependencies Type="lib_link">
+ <Dependency Name="globus_common">
+@@ -84,6 +89,11 @@
+ <Simple_Version Major="6"/>
+ </Version>
+ </Dependency>
++ <Dependency Name="globus_gsi_sysconfig">
++ <Version>
++ <Simple_Version Major="5"/>
++ </Version>
++ </Dependency>
+ </Source_Dependencies>
+ <With_Flavors ColocateLibraries="no" build="yes"/>
+ <Build_Environment>
diff --git a/globus-gssapi-gsi-doxygen.patch b/globus-gssapi-gsi-doxygen.patch
new file mode 100644
index 0000000..8a758ad
--- /dev/null
+++ b/globus-gssapi-gsi-doxygen.patch
@@ -0,0 +1,69 @@
+diff -ur globus_gssapi_gsi-10.2.orig/library/globus_gsi_gss_constants.h globus_gssapi_gsi-10.2/library/globus_gsi_gss_constants.h
+--- globus_gssapi_gsi-10.2.orig/library/globus_gsi_gss_constants.h 2006-01-19 06:56:09.000000000 +0100
++++ globus_gssapi_gsi-10.2/library/globus_gsi_gss_constants.h 2012-01-05 15:26:47.055685486 +0100
+@@ -14,6 +14,9 @@
+ * limitations under the License.
+ */
+
++#ifndef _GLOBUS_GSI_GSSAPI_CONSTANTS_H_
++#define _GLOBUS_GSI_GSSAPI_CONSTANTS_H_
++
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+ * @file globus_gsi_gssapi_constants.h
+@@ -25,9 +28,6 @@
+ */
+ #endif
+
+-#ifndef _GLOBUS_GSI_GSSAPI_CONSTANTS_H_
+-#define _GLOBUS_GSI_GSSAPI_CONSTANTS_H_
+-
+ extern char * globus_l_gsi_gssapi_error_strings[];
+
+ /**
+diff -ur globus_gssapi_gsi-10.2.orig/library/globus_i_gsi_gss_utils.h globus_gssapi_gsi-10.2/library/globus_i_gsi_gss_utils.h
+--- globus_gssapi_gsi-10.2.orig/library/globus_i_gsi_gss_utils.h 2011-11-02 14:47:22.000000000 +0100
++++ globus_gssapi_gsi-10.2/library/globus_i_gsi_gss_utils.h 2012-01-05 15:25:22.135686229 +0100
+@@ -14,6 +14,9 @@
+ * limitations under the License.
+ */
+
++#ifndef GLOBUS_I_GSI_GSS_UTILS_H
++#define GLOBUS_I_GSI_GSS_UTILS_H
++
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+ * @file globus_i_gsi_gss_utils.c
+@@ -25,9 +28,6 @@
+ */
+ #endif
+
+-#ifndef GLOBUS_I_GSI_GSS_UTILS_H
+-#define GLOBUS_I_GSI_GSS_UTILS_H
+-
+ #include "gssapi.h"
+ #include "gssapi_openssl.h"
+
+diff -ur globus_gssapi_gsi-10.2.orig/library/gssapi_openssl.h globus_gssapi_gsi-10.2/library/gssapi_openssl.h
+--- globus_gssapi_gsi-10.2.orig/library/gssapi_openssl.h 2010-02-19 22:23:03.000000000 +0100
++++ globus_gssapi_gsi-10.2/library/gssapi_openssl.h 2012-01-05 15:24:53.315686557 +0100
+@@ -14,6 +14,9 @@
+ * limitations under the License.
+ */
+
++#ifndef _GSSAPI_OPENSSL_H
++#define _GSSAPI_OPENSSL_H
++
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+ * @file gssapi_openssl.h
+@@ -25,9 +28,6 @@
+ */
+ #endif
+
+-#ifndef _GSSAPI_OPENSSL_H
+-#define _GSSAPI_OPENSSL_H
+-
+ #if defined(WIN32)
+ #define _WINSOCKAPI_ //rcg 9/23/03
+ # include "windows.h"
diff --git a/globus-gssapi-gsi-format.patch b/globus-gssapi-gsi-format.patch
new file mode 100644
index 0000000..3d252d9
--- /dev/null
+++ b/globus-gssapi-gsi-format.patch
@@ -0,0 +1,41 @@
+diff -ur globus_gssapi_gsi-10.2.orig/library/compare_name.c globus_gssapi_gsi-10.2/library/compare_name.c
+--- globus_gssapi_gsi-10.2.orig/library/compare_name.c 2008-11-21 16:04:49.000000000 +0100
++++ globus_gssapi_gsi-10.2/library/compare_name.c 2011-12-27 20:58:34.447192918 +0100
+@@ -273,10 +273,12 @@
+ }
+
+ GLOBUS_I_GSI_GSSAPI_DEBUG_PRINT(2, _GGSL("Comparing names:\n"));
+- GLOBUS_I_GSI_GSSAPI_DEBUG_PRINT(2, (_GGSL("Name 1 is of type %s:\n"),
+- gss_l_name_types[type1]));
+- GLOBUS_I_GSI_GSSAPI_DEBUG_PRINT(2, (_GGSL("Name 2 is of type %s:\n"),
+- gss_l_name_types[type2]));
++ GLOBUS_I_GSI_GSSAPI_DEBUG_FPRINTF(2, (globus_i_gsi_gssapi_debug_fstream,
++ _GGSL("Name 1 is of type %s:\n"),
++ gss_l_name_types[type1]));
++ GLOBUS_I_GSI_GSSAPI_DEBUG_FPRINTF(2, (globus_i_gsi_gssapi_debug_fstream,
++ _GGSL("Name 2 is of type %s:\n"),
++ gss_l_name_types[type2]));
+
+ /* Normalize order of name1 and name2 so we can have fewer comparisons
+ * below
+diff -ur globus_gssapi_gsi-10.2.orig/library/globus_i_gsi_gss_utils.h globus_gssapi_gsi-10.2/library/globus_i_gsi_gss_utils.h
+--- globus_gssapi_gsi-10.2.orig/library/globus_i_gsi_gss_utils.h 2011-11-02 14:47:22.000000000 +0100
++++ globus_gssapi_gsi-10.2/library/globus_i_gsi_gss_utils.h 2011-12-27 20:30:31.199300457 +0100
+@@ -159,7 +159,7 @@
+ char * _tmp_str_ = \
+ globus_common_create_nstring _MESSAGE_; \
+ globus_libc_fprintf(globus_i_gsi_gssapi_debug_fstream, \
+- _tmp_str_); \
++ "%s", _tmp_str_); \
+ globus_libc_free(_tmp_str_); \
+ } \
+ }
+@@ -170,7 +170,7 @@
+ { \
+ globus_libc_fprintf( \
+ globus_i_gsi_gssapi_debug_fstream, \
+- _MESSAGE_); \
++ "%s", _MESSAGE_); \
+ } \
+ }
+
diff --git a/globus-gssapi-gsi.spec b/globus-gssapi-gsi.spec
index 935dbab..55b8c6f 100644
--- a/globus-gssapi-gsi.spec
+++ b/globus-gssapi-gsi.spec
@@ -1,44 +1,48 @@
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
+%global flavor gcc64
%else
-%global flavor gcc32pthr
+%global flavor gcc32
%endif
Name: globus-gssapi-gsi
%global _name %(tr - _ <<< %{name})
-Version: 7.8
+Version: 10.2
Release: 1%{?dist}
Summary: Globus Toolkit - GSSAPI 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.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/gssapi/source globus_gssapi_gsi-7.8
-# cp -p gt5.0.4-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gssapi_gsi-7.8
-# tar -zcf globus_gssapi_gsi-7.8.tar.gz globus_gssapi_gsi-7.8
-Source: %{_name}-%{version}.tar.gz
+Source: http://www.globus.org/ftppub/gt5/5.2/5.2.0/packages/src/%{_name}-%{version}.tar.gz
# README file
Source8: GLOBUS-GSIC
# 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
+Patch0: %{name}-deps.patch
+Patch1: %{name}-format.patch
+Patch2: %{name}-doxygen.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: globus-openssl%{?_isa} >= 1
-Requires: globus-gsi-cert-utils%{?_isa} >= 6.7
-BuildRequires: grid-packaging-tools
-BuildRequires: globus-gsi-credential-devel%{?_isa} >= 1
-BuildRequires: globus-gsi-callback-devel%{?_isa}
-BuildRequires: globus-openssl-module-devel%{?_isa}
-BuildRequires: globus-gsi-openssl-error-devel%{?_isa}
-BuildRequires: globus-openssl-devel%{?_isa} >= 1
-BuildRequires: globus-gsi-proxy-core-devel%{?_isa} >= 1
-BuildRequires: globus-core%{?_isa} >= 4
-BuildRequires: globus-gsi-cert-utils-devel%{?_isa} >= 6.7
-BuildRequires: globus-common-devel%{?_isa} >= 3
+Requires: globus-gsi-credential%{?_isa} >= 5
+Requires: globus-gsi-callback%{?_isa} >= 4
+Requires: globus-openssl-module%{?_isa} >= 3
+Requires: globus-gsi-openssl-error%{?_isa} >= 2
+Requires: globus-gsi-proxy-core%{?_isa} >= 6
+Requires: globus-gsi-cert-utils%{?_isa} >= 8
+Requires: globus-gsi-sysconfig%{?_isa} >= 5
+Requires: globus-common%{?_isa} >= 14
+BuildRequires: grid-packaging-tools >= 3.4
+BuildRequires: globus-core%{?_isa} >= 8
+BuildRequires: globus-gsi-credential-devel%{?_isa} >= 5
+BuildRequires: globus-gsi-callback-devel%{?_isa} >= 4
+BuildRequires: globus-openssl-module-devel%{?_isa} >= 3
+BuildRequires: globus-gsi-openssl-error-devel%{?_isa} >= 2
+BuildRequires: globus-gsi-proxy-core-devel%{?_isa} >= 6
+BuildRequires: globus-gsi-cert-utils-devel%{?_isa} >= 8
+BuildRequires: globus-gsi-sysconfig-devel%{?_isa} >= 5
+BuildRequires: globus-common-devel%{?_isa} >= 14
+BuildRequires: openssl-devel%{?_isa}
BuildRequires: doxygen
BuildRequires: graphviz
%if "%{?rhel}" == "5"
@@ -55,15 +59,16 @@ BuildRequires: tetex-latex
Summary: Globus Toolkit - GSSAPI library Development Files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: globus-gsi-credential-devel%{?_isa} >= 1
-Requires: globus-gsi-callback-devel%{?_isa}
-Requires: globus-openssl-module-devel%{?_isa}
-Requires: globus-gsi-openssl-error-devel%{?_isa}
-Requires: globus-openssl-devel%{?_isa} >= 1
-Requires: globus-gsi-proxy-core-devel%{?_isa} >= 1
-Requires: globus-core%{?_isa} >= 4
-Requires: globus-gsi-cert-utils-devel%{?_isa} >= 5
-Requires: globus-common-devel%{?_isa} >= 3
+Requires: globus-gsi-credential-devel%{?_isa} >= 5
+Requires: globus-gsi-callback-devel%{?_isa} >= 4
+Requires: globus-openssl-module-devel%{?_isa} >= 3
+Requires: globus-gsi-openssl-error-devel%{?_isa} >= 2
+Requires: globus-gsi-proxy-core-devel%{?_isa} >= 6
+Requires: globus-core%{?_isa} >= 8
+Requires: globus-gsi-cert-utils-devel%{?_isa} >= 8
+Requires: globus-gsi-sysconfig-devel%{?_isa} >= 5
+Requires: globus-common-devel%{?_isa} >= 14
+Requires: openssl-devel%{?_isa}
%package doc
Summary: Globus Toolkit - GSSAPI library Documentation Files
@@ -102,6 +107,9 @@ GSSAPI library Documentation Files
%prep
%setup -q -n %{_name}-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%if "%{rhel}" == "5"
mkdir bin
@@ -120,18 +128,15 @@ 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
-
+unset GLOBUS_LOCATION
+unset GPT_LOCATION
%{_datadir}/globus/globus-bootstrap.sh
-%configure --with-flavor=%{flavor} --enable-doxygen
+%configure --disable-static --with-flavor=%{flavor} \
+ --enable-doxygen --with-docdir=%{_docdir}/%{name}-%{version}
+
+# Reduce overlinking
+sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
make %{?_smp_mflags}
@@ -147,22 +152,12 @@ GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
# Remove libtool archives (.la files)
find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
-sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist
+sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
-# Remove static libraries (.a files)
-find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.a' -exec rm -v '{}' \;
-sed '/lib.*\.a$/d' -i $GLOBUSPACKAGEDIR/%{_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 $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
+# Move license file to main package
+grep GLOBUS_LICENSE $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
+ >> $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist
+sed /GLOBUS_LICENSE/d -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
# Remove unwanted documentation (needed for RHEL4)
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
@@ -173,10 +168,6 @@ sed -e '/_%{_name}-%{version}_.*\.3/d' \
rm -f $RPM_BUILD_ROOT%{_mandir}/man3/deprecated.3
sed -e '/deprecated\.3/d' -i $GLOBUSPACKAGEDIR/%{_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}
-
# Install README file
install -m 644 -p %{SOURCE8} \
$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README
@@ -200,18 +191,19 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%dir %{_datadir}/globus/packages/%{_name}
%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/GLOBUS_LICENSE
%doc %{_docdir}/%{name}-%{version}/README
%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
+* Wed Dec 14 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 10.2-1
+- Update to Globus Toolkit 5.2.0
+
* Fri Jun 03 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 7.8-1
- Update to Globus Toolkit 5.0.4
diff --git a/sources b/sources
index 6045bb0..1674383 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw
-08a0f7b3f71b775614607b5ea319e2cd globus_gssapi_gsi-7.8.tar.gz
+82fce8065aafa0c2b37d31622d8540d8 globus_gssapi_gsi-10.2.tar.gz
More information about the scm-commits
mailing list