rpms/globus-gsi-proxy-ssl/F-11 globus-gsi-proxy-ssl-asn1-method.patch, NONE, 1.1 globus-gsi-proxy-ssl-typo.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 globus-gsi-proxy-ssl.spec, 1.4, 1.5 import.log, 1.3, 1.4 sources, 1.2, 1.3 globus-gsi-proxy-ssl-doxygen.patch, 1.1, NONE

Mattias Ellert ellert at fedoraproject.org
Tue Feb 9 07:35:18 UTC 2010 

Author: ellert

Update of /cvs/pkgs/rpms/globus-gsi-proxy-ssl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31654/F-11

Modified Files:
	.cvsignore globus-gsi-proxy-ssl.spec import.log sources 
Added Files:
	globus-gsi-proxy-ssl-asn1-method.patch 
	globus-gsi-proxy-ssl-typo.patch 
Removed Files:
	globus-gsi-proxy-ssl-doxygen.patch 
Log Message:
* Fri Jan 22 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0-1
- Update to Globus Toolkit 5.0.0


globus-gsi-proxy-ssl-asn1-method.patch:
 proxycertinfo.c |    2 ++
 proxycertinfo.h |    2 ++
 proxypolicy.c   |    2 ++
 proxypolicy.h   |    2 ++
 4 files changed, 8 insertions(+)

--- NEW FILE globus-gsi-proxy-ssl-asn1-method.patch ---
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxycertinfo.c globus_gsi_proxy_ssl-1.5/library/proxycertinfo.c
--- globus_gsi_proxy_ssl-1.5.orig/library/proxycertinfo.c	2006-01-19 06:56:28.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxycertinfo.c	2009-08-21 20:41:11.830075761 +0200
@@ -33,6 +33,7 @@
 
 #include "proxycertinfo.h"
 
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
 /**
  * @name ASN1_METHOD
  */
@@ -62,6 +63,7 @@
 }
 /* PROXYCERTINFO_asn1_meth() */
 /*@}*/
+#endif
 
 
 /**
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxycertinfo.h globus_gsi_proxy_ssl-1.5/library/proxycertinfo.h
--- globus_gsi_proxy_ssl-1.5.orig/library/proxycertinfo.h	2006-01-19 06:56:29.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxycertinfo.h	2009-08-21 20:44:55.379075927 +0200
@@ -121,7 +121,9 @@
 
 /* functions */
     
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
 ASN1_METHOD * PROXYCERTINFO_asn1_meth();
+#endif
 
 PROXYCERTINFO * PROXYCERTINFO_new();
 
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.c globus_gsi_proxy_ssl-1.5/library/proxypolicy.c
--- globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.c	2006-01-19 06:56:29.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxypolicy.c	2009-08-21 20:43:23.693075246 +0200
@@ -22,6 +22,7 @@
 
 #include "proxypolicy.h"
 
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
 /**
  * @name Get a method for ASN1 conversion
  */
@@ -50,6 +51,7 @@
 }
 /* PROXYPOLICY_asn1_meth() */
 /* @} */
+#endif
 
 /**
  * @name New
diff -ur globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.h globus_gsi_proxy_ssl-1.5/library/proxypolicy.h
--- globus_gsi_proxy_ssl-1.5.orig/library/proxypolicy.h	2006-01-19 06:56:29.000000000 +0100
+++ globus_gsi_proxy_ssl-1.5/library/proxypolicy.h	2009-08-21 20:41:40.682075989 +0200
@@ -102,7 +102,9 @@
 
 /* functions */
 
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
 ASN1_METHOD * PROXYPOLICY_asn1_meth();
+#endif
 
 PROXYPOLICY * PROXYPOLICY_new();
 

globus-gsi-proxy-ssl-typo.patch:
 proxycertinfo.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE globus-gsi-proxy-ssl-typo.patch ---
diff -ur globus_gsi_proxy_ssl-2.0.orig/library/proxycertinfo.c globus_gsi_proxy_ssl-2.0/library/proxycertinfo.c
--- globus_gsi_proxy_ssl-2.0.orig/library/proxycertinfo.c	2008-10-16 17:55:15.000000000 +0200
+++ globus_gsi_proxy_ssl-2.0/library/proxycertinfo.c	2010-01-22 18:26:49.079281197 +0100
@@ -442,7 +442,7 @@
  * the PROXYCERTINFO 
  * @param length the length of the buffer
  *
- * @return the resultingin PROXYCERTINFO in internal form
+ * @return the resulting PROXYCERTINFO in internal form
  */                                             
 PROXYCERTINFO * d2i_PROXYCERTINFO(
     PROXYCERTINFO **                    cert_info,


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 Apr 2009 13:03:18 -0000	1.2
+++ .cvsignore	9 Feb 2010 07:35:17 -0000	1.3
@@ -1,2 +1,2 @@
 epstopdf-2.9.5gw
-globus_gsi_proxy_ssl-1.5.tar.gz
+globus_gsi_proxy_ssl-2.0.tar.gz


Index: globus-gsi-proxy-ssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/F-11/globus-gsi-proxy-ssl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- globus-gsi-proxy-ssl.spec	25 Jul 2009 07:34:14 -0000	1.4
+++ globus-gsi-proxy-ssl.spec	9 Feb 2010 07:35:17 -0000	1.5
@@ -6,26 +6,29 @@
 
 Name:		globus-gsi-proxy-ssl
 %global _name %(tr - _ <<< %{name})
-Version:	1.5
-Release:	4%{?dist}
+Version:	2.0
+Release:	1%{?dist}
 Summary:	Globus Toolkit - Globus GSI Proxy SSL 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/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/proxy/proxy_ssl/source globus_gsi_proxy_ssl-1.5
-#		cp -p gt4.2.1-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_proxy_ssl-1.5
-#		tar -zcf globus_gsi_proxy_ssl-1.5.tar.gz globus_gsi_proxy_ssl-1.5
+#		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/proxy/proxy_ssl/source globus_gsi_proxy_ssl-2.0
+#		cp -p gt5.0.0-all-source-installer/source-trees/core/source/GLOBUS_LICENSE globus_gsi_proxy_ssl-2.0
+#		tar -zcf globus_gsi_proxy_ssl-2.0.tar.gz globus_gsi_proxy_ssl-2.0
 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
-#		Fix some doxygen warnings:
-#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6478
-Patch0:		%{name}-doxygen.patch
+#		ASN1_METHOD not available in openssl 1.0.0:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6841
+Patch0:		%{name}-asn1-method.patch
+#		Typo in doxygen generated man page:
+#		http://bugzilla.globus.org/bugzilla/show_bug.cgi?id=6919
+Patch1:		%{name}-typo.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	globus-openssl%{?_isa} >= 1
@@ -89,6 +92,7 @@ Globus GSI Proxy SSL Library Documentati
 %prep
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %if "%{rhel}" == "5"
 mkdir bin
@@ -190,6 +194,15 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Fri Jan 22 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0-1
+- Update to Globus Toolkit 5.0.0
+
+* Fri Aug 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-6
+- Fix for new openssl - ASN1_METHOD no longer supported
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.5-5
+- rebuilt with new openssl
+
 * Thu Jul 23 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-4
 - Add instruction set architecture (isa) tags
 - Make doc subpackage noarch


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	15 Jun 2009 16:18:11 -0000	1.3
+++ import.log	9 Feb 2010 07:35:18 -0000	1.4
@@ -1,3 +1,4 @@
 globus-gsi-proxy-ssl-1_5-1_fc9:F-11:globus-gsi-proxy-ssl-1.5-1.fc9.src.rpm:1240578169
 globus-gsi-proxy-ssl-1_5-2_fc9:F-11:globus-gsi-proxy-ssl-1.5-2.fc9.src.rpm:1240870417
 globus-gsi-proxy-ssl-1_5-3_fc9:F-11:globus-gsi-proxy-ssl-1.5-3.fc9.src.rpm:1245082671
+globus-gsi-proxy-ssl-2_0-1_fc12:F-11:globus-gsi-proxy-ssl-2.0-1.fc12.src.rpm:1265700902


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 Apr 2009 13:03:19 -0000	1.2
+++ sources	9 Feb 2010 07:35:18 -0000	1.3
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-c78a489a7bdc42c42c9dc5a071b360e5  globus_gsi_proxy_ssl-1.5.tar.gz
+aac955afa731b5feaf06013b84d88fe0  globus_gsi_proxy_ssl-2.0.tar.gz


--- globus-gsi-proxy-ssl-doxygen.patch DELETED ---

More information about the scm-commits mailing list