[globus-gsi-callback/el4] Update to Globus Toolkit 5.2.0
Mattias Ellert
ellert at fedoraproject.org
Sun Jan 8 01:18:52 UTC 2012
commit d4654f4dc32bc760eee9053ea6a9837b8574c842
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sat Jan 7 13:19:00 2012 +0100
Update to Globus Toolkit 5.2.0
.gitignore | 2 +-
GLOBUS-GSIC | 6 ++
globus-gsi-callback-deps.patch | 12 ++++
globus-gsi-callback-doxygen.patch | 69 +++++++++++++++++++++++
globus-gsi-callback-format.patch | 12 ++++
globus-gsi-callback.spec | 108 ++++++++++++++++--------------------
sources | 2 +-
7 files changed, 149 insertions(+), 62 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4ffc3af..943fe53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
/epstopdf-2.9.5gw
-/globus_gsi_callback-2.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-gsi-callback-deps.patch b/globus-gsi-callback-deps.patch
new file mode 100644
index 0000000..4a0c0ee
--- /dev/null
+++ b/globus-gsi-callback-deps.patch
@@ -0,0 +1,12 @@
+diff -ur globus_gsi_callback-4.1.orig/configure.in globus_gsi_callback-4.1/configure.in
+--- globus_gsi_callback-4.1.orig/configure.in 2004-08-24 17:38:28.000000000 +0200
++++ globus_gsi_callback-4.1/configure.in 2011-12-27 06:14:17.942683037 +0100
+@@ -13,6 +13,8 @@
+
+ AC_CHECK_HEADERS(malloc.h sys/time.h unistd.h)
+
++GLOBUS_OPENSSL
++
+ LAC_DOXYGEN(["../library"])
+
+ GLOBUS_FINALIZE
diff --git a/globus-gsi-callback-doxygen.patch b/globus-gsi-callback-doxygen.patch
new file mode 100644
index 0000000..3240e92
--- /dev/null
+++ b/globus-gsi-callback-doxygen.patch
@@ -0,0 +1,69 @@
+diff -ur globus_gsi_callback-4.1.orig/library/globus_gsi_callback_constants.h globus_gsi_callback-4.1/library/globus_gsi_callback_constants.h
+--- globus_gsi_callback-4.1.orig/library/globus_gsi_callback_constants.h 2007-06-13 18:24:36.000000000 +0200
++++ globus_gsi_callback-4.1/library/globus_gsi_callback_constants.h 2012-01-05 12:50:56.099468219 +0100
+@@ -14,6 +14,9 @@
+ * limitations under the License.
+ */
+
++#ifndef GLOBUS_GSI_CALLBACK_CONSTANTS_H
++#define GLOBUS_GSI_CALLBACK_CONSTANTS_H
++
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+ * @file globus_gsi_callback_constants.h
+@@ -26,9 +29,6 @@
+ */
+ #endif
+
+-#ifndef GLOBUS_GSI_CALLBACK_CONSTANTS_H
+-#define GLOBUS_GSI_CALLBACK_CONSTANTS_H
+-
+ #ifndef EXTERN_C_BEGIN
+ # ifdef __cplusplus
+ # define EXTERN_C_BEGIN extern "C" {
+diff -ur globus_gsi_callback-4.1.orig/library/globus_gsi_callback.h globus_gsi_callback-4.1/library/globus_gsi_callback.h
+--- globus_gsi_callback-4.1.orig/library/globus_gsi_callback.h 2011-03-08 17:19:42.000000000 +0100
++++ globus_gsi_callback-4.1/library/globus_gsi_callback.h 2012-01-05 12:51:27.323473934 +0100
+@@ -14,6 +14,9 @@
+ * limitations under the License.
+ */
+
++#ifndef _GLOBUS_GSI_CALLBACK_H_
++#define _GLOBUS_GSI_CALLBACK_H_
++
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+ * @file globus_gsi_callback.h
+@@ -26,9 +29,6 @@
+ */
+ #endif
+
+-#ifndef _GLOBUS_GSI_CALLBACK_H_
+-#define _GLOBUS_GSI_CALLBACK_H_
+-
+ #ifndef EXTERN_C_BEGIN
+ # ifdef __cplusplus
+ # define EXTERN_C_BEGIN extern "C" {
+diff -ur globus_gsi_callback-4.1.orig/library/globus_i_gsi_callback.h globus_gsi_callback-4.1/library/globus_i_gsi_callback.h
+--- globus_gsi_callback-4.1.orig/library/globus_i_gsi_callback.h 2011-03-08 17:19:42.000000000 +0100
++++ globus_gsi_callback-4.1/library/globus_i_gsi_callback.h 2012-01-05 12:52:06.399480867 +0100
+@@ -14,6 +14,9 @@
+ * limitations under the License.
+ */
+
++#ifndef _GLOBUS_I_GSI_CALLBACK_H_
++#define _GLOBUS_I_GSI_CALLBACK_H_
++
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+ * @file globus_i_gsi_callback.h
+@@ -25,9 +28,6 @@
+ * $Date: 2011/03/08 16:19:42 $
+ */
+
+-#ifndef _GLOBUS_I_GSI_CALLBACK_H_
+-#define _GLOBUS_I_GSI_CALLBACK_H_
+-
+ #include "globus_gsi_callback.h"
+ #include "globus_gsi_cert_utils.h"
+
diff --git a/globus-gsi-callback-format.patch b/globus-gsi-callback-format.patch
new file mode 100644
index 0000000..2a87107
--- /dev/null
+++ b/globus-gsi-callback-format.patch
@@ -0,0 +1,12 @@
+diff -ur globus_gsi_callback-4.1.orig/library/oldgaa/oldgaa_gl_internal_err.c globus_gsi_callback-4.1/library/oldgaa/oldgaa_gl_internal_err.c
+--- globus_gsi_callback-4.1.orig/library/oldgaa/oldgaa_gl_internal_err.c 2006-01-19 06:55:32.000000000 +0100
++++ globus_gsi_callback-4.1/library/oldgaa/oldgaa_gl_internal_err.c 2011-12-27 06:10:17.786667045 +0100
+@@ -36,7 +36,7 @@
+ fprintf(stderr, "Internal error in file %s (line %d): %s\n",
+ file, line, msg);
+ } else {
+- fprintf(stderr, msg);
++ fprintf(stderr, "%s", msg);
+ }
+ /* internal_error() must never return; should break.
+ */
diff --git a/globus-gsi-callback.spec b/globus-gsi-callback.spec
index 78cf576..1751b11 100644
--- a/globus-gsi-callback.spec
+++ b/globus-gsi-callback.spec
@@ -1,42 +1,43 @@
%ifarch alpha ia64 ppc64 s390x sparc64 x86_64
-%global flavor gcc64pthr
+%global flavor gcc64
%else
-%global flavor gcc32pthr
+%global flavor gcc32
%endif
Name: globus-gsi-callback
%global _name %(tr - _ <<< %{name})
-Version: 2.8
-Release: 2%{?dist}
+Version: 4.1
+Release: 1%{?dist}
Summary: Globus Toolkit - Globus GSI Callback 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.3/installers/src/gt5.0.3-all-source-installer.tar.bz2
-# tar -jxf gt5.0.3-all-source-installer.tar.bz2
-# mv gt5.0.3-all-source-installer/source-trees/gsi/callback/source globus_gsi_callback-2.8
-# cp -p gt5.0.3-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_callback-2.8
-# tar -zcf globus_gsi_callback-2.8.tar.gz globus_gsi_callback-2.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}-format.patch
+Patch1: %{name}-deps.patch
+Patch2: %{name}-doxygen.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: globus-openssl%{?_isa} >= 1
-BuildRequires: grid-packaging-tools
-BuildRequires: globus-gsi-proxy-ssl-devel%{?_isa} >= 1
-BuildRequires: globus-openssl-module-devel%{?_isa}
-BuildRequires: globus-gsi-openssl-error-devel%{?_isa}
-BuildRequires: globus-openssl-devel%{?_isa} >= 1
-BuildRequires: globus-core%{?_isa} >= 4
-BuildRequires: globus-gsi-cert-utils-devel%{?_isa} >= 2
-BuildRequires: globus-common-devel%{?_isa} >= 3
-BuildRequires: globus-gsi-sysconfig-devel%{?_isa} >= 1
+Requires: globus-gsi-proxy-ssl%{?_isa} >= 4
+Requires: globus-gsi-cert-utils%{?_isa} >= 8
+Requires: globus-gsi-sysconfig%{?_isa} >= 5
+Requires: globus-common%{?_isa} >= 14
+Requires: globus-gsi-openssl-error%{?_isa} >= 2
+BuildRequires: grid-packaging-tools >= 3.4
+BuildRequires: globus-core%{?_isa} >= 8
+BuildRequires: globus-gsi-proxy-ssl-devel%{?_isa} >= 4
+BuildRequires: globus-gsi-cert-utils-devel%{?_isa} >= 8
+BuildRequires: globus-gsi-sysconfig-devel%{?_isa} >= 5
+BuildRequires: globus-common-devel%{?_isa} >= 14
+BuildRequires: globus-openssl-module-devel%{?_isa} >= 3
+BuildRequires: globus-gsi-openssl-error-devel%{?_isa} >= 2
+BuildRequires: openssl-devel%{?_isa}
BuildRequires: doxygen
BuildRequires: graphviz
%if "%{?rhel}" == "5"
@@ -53,14 +54,14 @@ BuildRequires: tetex-latex
Summary: Globus Toolkit - Globus GSI Callback Library Development Files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: globus-gsi-proxy-ssl-devel%{?_isa} >= 1
-Requires: globus-openssl-module-devel%{?_isa}
-Requires: globus-gsi-openssl-error-devel%{?_isa}
-Requires: globus-openssl-devel%{?_isa} >= 1
-Requires: globus-core%{?_isa} >= 4
-Requires: globus-gsi-cert-utils-devel%{?_isa} >= 2
-Requires: globus-common-devel%{?_isa} >= 3
-Requires: globus-gsi-sysconfig-devel%{?_isa} >= 1
+Requires: globus-gsi-proxy-ssl-devel%{?_isa} >= 4
+Requires: globus-gsi-cert-utils-devel%{?_isa} >= 8
+Requires: globus-gsi-sysconfig-devel%{?_isa} >= 5
+Requires: globus-common-devel%{?_isa} >= 14
+Requires: globus-openssl-module-devel%{?_isa} >= 3
+Requires: globus-gsi-openssl-error-devel%{?_isa} >= 2
+Requires: globus-core%{?_isa} >= 8
+Requires: openssl-devel%{?_isa}
%package doc
Summary: Globus Toolkit - Globus GSI Callback Library Documentation Files
@@ -99,6 +100,9 @@ Globus GSI Callback Library Documentation Files
%prep
%setup -q -n %{_name}-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%if "%{rhel}" == "5"
mkdir bin
@@ -117,18 +121,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}
@@ -144,22 +145,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
@@ -170,10 +161,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
@@ -197,18 +184,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
+* Tue Dec 13 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.1-1
+- Update to Globus Toolkit 5.2.0
+
* Sun Apr 24 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.8-2
- Add README file
diff --git a/sources b/sources
index e60465b..f432767 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw
-9c2eeb6f9105a98a9ae10cd53931cb19 globus_gsi_callback-2.8.tar.gz
+708311006ac7dc6fb0efb5cd123f4ab0 globus_gsi_callback-4.1.tar.gz
More information about the scm-commits
mailing list