diff --git a/.cvsignore b/.cvsignore index b437b64..cfce562 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ epstopdf-2.9.5gw -globus_gsi_credential-3.2.tar.gz +globus_gsi_credential-3.3.tar.gz diff --git a/globus-gsi-credential-openssl.patch b/globus-gsi-credential-openssl.patch deleted file mode 100644 index 076103a..0000000 --- a/globus-gsi-credential-openssl.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -up globus_gsi_credential-2.2/library/globus_gsi_credential.h.openssl globus_gsi_credential-2.2/library/globus_gsi_credential.h ---- globus_gsi_credential-2.2/library/globus_gsi_credential.h.openssl 2007-08-06 22:49:25.000000000 +0200 -+++ globus_gsi_credential-2.2/library/globus_gsi_credential.h 2009-08-22 10:17:05.000000000 +0200 -@@ -158,6 +158,10 @@ typedef struct globus_l_gsi_cred_handle_ - * - * @see globus_gsi_cred_handle_init - */ -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+#define STACK STACK_OF(OPENSSL_STRING) -+#endif -+ - typedef struct globus_l_gsi_cred_handle_attrs_s * - globus_gsi_cred_handle_attrs_t; - -diff -up globus_gsi_credential-2.2/library/globus_gsi_cred_handle.c.openssl globus_gsi_credential-2.2/library/globus_gsi_cred_handle.c ---- globus_gsi_credential-2.2/library/globus_gsi_cred_handle.c.openssl 2008-09-11 14:52:50.000000000 +0200 -+++ globus_gsi_credential-2.2/library/globus_gsi_cred_handle.c 2009-08-22 11:13:04.000000000 +0200 -@@ -1279,7 +1279,11 @@ globus_gsi_cred_get_policies( - goto exit; - } - -+#if OPENSSL_VERSION_NUMBER < 0x10000000L - if((*policies = sk_new_null()) == NULL) -+#else -+ if((*policies = sk_OPENSSL_STRING_new_null()) == NULL) -+#endif - { - GLOBUS_GSI_CRED_OPENSSL_ERROR_RESULT( - result, -@@ -1358,7 +1362,11 @@ globus_gsi_cred_get_policies( - goto error_exit; - } - -+#if OPENSSL_VERSION_NUMBER < 0x10000000L - if(sk_push(*policies, final_policy_string) == 0) -+#else -+ if(sk_OPENSSL_STRING_push(*policies, (OPENSSL_STRING)final_policy_string) == 0) -+#endif - { - GLOBUS_GSI_CRED_OPENSSL_ERROR_RESULT( - result, -@@ -1390,7 +1398,11 @@ globus_gsi_cred_get_policies( - - if(*policies != NULL) - { -+#if OPENSSL_VERSION_NUMBER < 0x10000000L - sk_pop_free(*policies, free); -+#else -+ sk_OPENSSL_STRING_pop_free(*policies, free); -+#endif - } - *policies = NULL; - diff --git a/globus-gsi-credential.spec b/globus-gsi-credential.spec index f7eda60..0597ebf 100644 --- a/globus-gsi-credential.spec +++ b/globus-gsi-credential.spec @@ -6,7 +6,7 @@ Name: globus-gsi-credential %global _name %(tr - _ <<< %{name}) -Version: 3.2 +Version: 3.3 Release: 1%{?dist} Summary: Globus Toolkit - Globus GSI Credential Library @@ -14,18 +14,15 @@ 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.0/installers/src/gt5.0.0-all-source-installer.tar.bz2 -# tar -jxf gt5.0.0-all-source-installer.tar.bz2 -# mv gt5.0.0-all-source-installer/source-trees/gsi/credential/source globus_gsi_credential-2.2 -# cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_credential-2.2 -# tar -zcf globus_gsi_credential-2.2.tar.gz globus_gsi_credential-2.2 +# wget -N http://www-unix.globus.org/ftppub/gt5/5.0/5.0.1/installers/src/gt5.0.1-all-source-installer.tar.bz2 +# tar -jxf gt5.0.1-all-source-installer.tar.bz2 +# mv gt5.0.1-all-source-installer/source-trees/gsi/credential/source globus_gsi_credential-3.3 +# cp -p gt5.0.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_credential-3.3 +# tar -zcf globus_gsi_credential-3.3.tar.gz globus_gsi_credential-3.3 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 -# Porting to compile with openssl 1.0.0: -# http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6841 -Patch0: %{name}-openssl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: globus-openssl%{?_isa} >= 1 @@ -100,7 +97,6 @@ Globus GSI Credential Library Documentation Files %prep %setup -q -n %{_name}-%{version} -%patch0 -p1 %if "%{rhel}" == "5" mkdir bin @@ -202,8 +198,12 @@ rm -rf $RPM_BUILD_ROOT %dir %{_docdir}/%{name}-%{version}/html %changelog +* Wed Apr 14 2010 Mattias Ellert - 3.3-1 +- Update to Globus Toolkit 5.0.1 +- Drop patch globus-gsi-credential-openssl.patch (fixed upstream) + * Fri Jan 22 2010 Mattias Ellert - 3.2-1 -- Upate to Globus Toolkit 5.0.0 +- Update to Globus Toolkit 5.0.0 * Sat Aug 22 2009 Tomas Mraz - 2.2-4 - rebuilt with new openssl diff --git a/import.log b/import.log index 885b778..ac34ead 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ globus-gsi-credential-2_2-1_fc9:EL-5:globus-gsi-credential-2.2-1.fc9.src.rpm:1241681530 globus-gsi-credential-2_2-2_fc9:EL-5:globus-gsi-credential-2.2-2.fc9.src.rpm:1245085709 globus-gsi-credential-3_2-1_fc12:EL-5:globus-gsi-credential-3.2-1.fc12.src.rpm:1265701993 +globus-gsi-credential-3_3-1_fc12:EL-5:globus-gsi-credential-3.3-1.fc12.src.rpm:1271429829 diff --git a/sources b/sources index f00988c..24f78d9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw -6b7bd28275ce14dc5e18c0c8b285da48 globus_gsi_credential-3.2.tar.gz +6c6b2f03f4249c9518bbcae5854e64ae globus_gsi_credential-3.3.tar.gz