[globus-gsi-cert-utils/el4] Update to Globus Toolkit 5.2.0 Drop patch globus-gsi-cert-utils-ca-setup.patch (fixed upstream)
Mattias Ellert
ellert at fedoraproject.org
Sun Jan 8 01:18:40 UTC 2012
commit 732adb3dcaf18becff21e9c4ffca1a930a427b32
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sat Jan 7 12:58:07 2012 +0100
Update to Globus Toolkit 5.2.0
Drop patch globus-gsi-cert-utils-ca-setup.patch (fixed upstream)
.gitignore | 2 +-
GLOBUS-GSIC | 6 ++
globus-gsi-cert-utils-ca-setup.patch | 19 ------
globus-gsi-cert-utils-deps.patch | 38 ++++++++++++
globus-gsi-cert-utils-format.patch | 12 ++++
globus-gsi-cert-utils-msg.patch | 14 ++++
globus-gsi-cert-utils.spec | 110 ++++++++++++++--------------------
sources | 2 +-
8 files changed, 117 insertions(+), 86 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9259ac4..943fe53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
/epstopdf-2.9.5gw
-/globus_gsi_cert_utils-6.7.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-cert-utils-deps.patch b/globus-gsi-cert-utils-deps.patch
new file mode 100644
index 0000000..ee3954d
--- /dev/null
+++ b/globus-gsi-cert-utils-deps.patch
@@ -0,0 +1,38 @@
+diff -ur globus_gsi_cert_utils-8.1.orig/configure.in globus_gsi_cert_utils-8.1/configure.in
+--- globus_gsi_cert_utils-8.1.orig/configure.in 2010-10-19 20:06:48.000000000 +0200
++++ globus_gsi_cert_utils-8.1/configure.in 2011-12-26 17:38:57.183035284 +0100
+@@ -13,6 +13,7 @@
+
+ AM_CONFIG_HEADER(config.h)
+
++GLOBUS_OPENSSL
+
+ AC_MSG_CHECKING(checking for time_t timezone in <time.h>)
+ AC_TRY_COMPILE(
+diff -ur globus_gsi_cert_utils-8.1.orig/pkgdata/pkg_data_src.gpt.in globus_gsi_cert_utils-8.1/pkgdata/pkg_data_src.gpt.in
+--- globus_gsi_cert_utils-8.1.orig/pkgdata/pkg_data_src.gpt.in 2011-10-25 15:27:41.000000000 +0200
++++ globus_gsi_cert_utils-8.1/pkgdata/pkg_data_src.gpt.in 2011-12-26 17:37:14.487039267 +0100
+@@ -27,6 +27,11 @@
+ <Simple_Version Major="2"/>
+ </Version>
+ </Dependency>
++ <Dependency Name="globus_gsi_proxy_ssl">
++ <Version>
++ <Simple_Version Major="4"/>
++ </Version>
++ </Dependency>
+ </Source_Dependencies>
+ <Source_Dependencies Type="lib_link">
+ <Dependency Name="globus_common">
+@@ -44,6 +49,11 @@
+ <Simple_Version Major="2"/>
+ </Version>
+ </Dependency>
++ <Dependency Name="globus_gsi_proxy_ssl">
++ <Version>
++ <Simple_Version Major="4"/>
++ </Version>
++ </Dependency>
+ </Source_Dependencies>
+ <With_Flavors ColocateLlibraries="no" build="yes"/>
+ <Build_Environment>
diff --git a/globus-gsi-cert-utils-format.patch b/globus-gsi-cert-utils-format.patch
new file mode 100644
index 0000000..faa1617
--- /dev/null
+++ b/globus-gsi-cert-utils-format.patch
@@ -0,0 +1,12 @@
+diff -ur globus_gsi_cert_utils-8.1.orig/library/globus_i_gsi_cert_utils.h globus_gsi_cert_utils-8.1/library/globus_i_gsi_cert_utils.h
+--- globus_gsi_cert_utils-8.1.orig/library/globus_i_gsi_cert_utils.h 2006-01-19 06:55:36.000000000 +0100
++++ globus_gsi_cert_utils-8.1/library/globus_i_gsi_cert_utils.h 2011-12-26 17:31:33.771051588 +0100
+@@ -55,7 +55,7 @@
+ char * _tmp_str_ = \
+ globus_common_create_nstring _MESSAGE_; \
+ globus_libc_fprintf(globus_i_gsi_cert_utils_debug_fstream, \
+- _tmp_str_); \
++ "%s", _tmp_str_); \
+ globus_libc_free(_tmp_str_); \
+ } \
+ }
diff --git a/globus-gsi-cert-utils-msg.patch b/globus-gsi-cert-utils-msg.patch
new file mode 100644
index 0000000..e5c6a08
--- /dev/null
+++ b/globus-gsi-cert-utils-msg.patch
@@ -0,0 +1,14 @@
+diff -ur globus_gsi_cert_utils-8.1.orig/programs/grid-cert-request.in globus_gsi_cert_utils-8.1/programs/grid-cert-request.in
+--- globus_gsi_cert_utils-8.1.orig/programs/grid-cert-request.in 2011-02-03 22:38:37.000000000 +0100
++++ globus_gsi_cert_utils-8.1/programs/grid-cert-request.in 2011-12-11 10:45:31.676068237 +0100
+@@ -857,8 +857,8 @@
+ echo "Error reading"
+ echo " /etc/grid-security/globus-user-ssl.conf"
+ echo " /etc/grid-security/globus-host-ssl.conf"
+- echo " \${sysconfdir}/globus-user-ssl.conf"
+- echo " \${sysconfdir}etc/globus-host-ssl.conf"
++ echo " ${sysconfdir}/globus-user-ssl.conf"
++ echo " ${sysconfdir}/globus-host-ssl.conf"
+ echo ""
+ echo "Can't find valid CA config files."
+ echo "Not all CAs use this tool to generate certificate requests."
diff --git a/globus-gsi-cert-utils.spec b/globus-gsi-cert-utils.spec
index e4c6f23..0e5300c 100644
--- a/globus-gsi-cert-utils.spec
+++ b/globus-gsi-cert-utils.spec
@@ -1,42 +1,40 @@
%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-cert-utils
%global _name %(tr - _ <<< %{name})
-Version: 6.7
-Release: 2%{?dist}
+Version: 8.1
+Release: 1%{?dist}
Summary: Globus Toolkit - Globus GSI Cert Utils 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/cert_utils/source globus_gsi_cert_utils-6.7
-# cp -p gt5.0.3-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_cert_utils-6.7
-# tar -zcf globus_gsi_cert_utils-6.7.tar.gz globus_gsi_cert_utils-6.7
-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
-# Improve the error message for missing CA setup files:
-# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6964
-Patch0: %{name}-ca-setup.patch
+Patch0: %{name}-msg.patch
+Patch1: %{name}-deps.patch
+Patch2: %{name}-format.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: globus-openssl%{?_isa} >= 1
-BuildRequires: grid-packaging-tools
-BuildRequires: globus-common-devel%{?_isa} >= 3
-BuildRequires: globus-openssl-module-devel%{?_isa}
-BuildRequires: globus-gsi-openssl-error-devel%{?_isa}
-BuildRequires: globus-openssl-devel%{?_isa} >= 1
-BuildRequires: globus-core%{?_isa} >= 4
+Requires: globus-gsi-proxy-ssl%{?_isa} >= 4
+Requires: globus-common%{?_isa} >= 14
+Requires: globus-openssl-module%{?_isa} >= 3
+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-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,18 +51,19 @@ BuildRequires: tetex-latex
Summary: Globus Toolkit - Globus GSI Cert Utils Library Programs
Group: Applications/Internet
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: globus-openssl-progs >= 1
-Requires: globus-common-setup >= 2
+Requires: globus-common-progs >= 14
+Requires: openssl
%package devel
Summary: Globus Toolkit - Globus GSI Cert Utils Library Development Files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: globus-common-devel%{?_isa} >= 3
-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-proxy-ssl-devel%{?_isa} >= 4
+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 Cert Utils Library Documentation Files
@@ -113,6 +112,8 @@ Globus GSI Cert Utils Library Documentation Files
%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%if "%{rhel}" == "5"
mkdir bin
@@ -131,18 +132,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}
@@ -158,43 +156,23 @@ 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
-
-# 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 admin binary to sbin
-mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-mv $RPM_BUILD_ROOT%{_bindir}/grid-default-ca $RPM_BUILD_ROOT%{_sbindir}
-sed 's!/bin/grid-default-ca!/sbin/grid-default-ca!' \
- -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist
+sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
# Move client man pages to progs package
grep '.[18]$' $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
>> $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist
sed '/.[18]$/d' -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
-# 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
sed -e '/_%{_name}-%{version}_.*\.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
@@ -220,7 +198,6 @@ 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-progs.filelist progs
@@ -228,13 +205,16 @@ rm -rf $RPM_BUILD_ROOT
%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> - 8.1-1
+- Update to Globus Toolkit 5.2.0
+- Drop patch globus-gsi-cert-utils-ca-setup.patch (fixed upstream)
+
* Sun Apr 24 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 6.7-2
- Add README file
diff --git a/sources b/sources
index 2ceb126..530d20b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw
-930347c70983e5fcb5f1af9d2b239e09 globus_gsi_cert_utils-6.7.tar.gz
+a2a48dbf941320507b0d19526281c546 globus_gsi_cert_utils-8.1.tar.gz
More information about the scm-commits
mailing list