rpms/globus-gsi-proxy-ssl/devel globus-gsi-proxy-ssl-asn1-method.patch, NONE, 1.1 globus-gsi-proxy-ssl.spec, 1.5, 1.6 import.log, 1.3, 1.4

[Mattias Ellert]

Author: ellert

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

Modified Files:
	globus-gsi-proxy-ssl.spec import.log 
Added Files:
	globus-gsi-proxy-ssl-asn1-method.patch 
Log Message:
* Fri Aug 21 2009 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-6
- Fix for new openssl - ASN1_METHOD no longer supported


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();
 


Index: globus-gsi-proxy-ssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/devel/globus-gsi-proxy-ssl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- globus-gsi-proxy-ssl.spec	21 Aug 2009 13:36:24 -0000	1.5
+++ globus-gsi-proxy-ssl.spec	21 Aug 2009 19:28:20 -0000	1.6
@@ -7,7 +7,7 @@
 Name:		globus-gsi-proxy-ssl
 %global _name %(tr - _ <<< %{name})
 Version:	1.5
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Globus Toolkit - Globus GSI Proxy SSL Library
 
 Group:		System Environment/Libraries
@@ -26,6 +26,9 @@ 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
+Patch1:		%{name}-asn1-method.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,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* 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
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/globus-gsi-proxy-ssl/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	15 Jun 2009 15:50:38 -0000	1.3
+++ import.log	21 Aug 2009 19:28:20 -0000	1.4
@@ -1,3 +1,4 @@
 globus-gsi-proxy-ssl-1_5-1_fc9:HEAD:globus-gsi-proxy-ssl-1.5-1.fc9.src.rpm:1240577820
 globus-gsi-proxy-ssl-1_5-2_fc9:HEAD:globus-gsi-proxy-ssl-1.5-2.fc9.src.rpm:1240870152
 globus-gsi-proxy-ssl-1_5-3_fc9:HEAD:globus-gsi-proxy-ssl-1.5-3.fc9.src.rpm:1245081016
+globus-gsi-proxy-ssl-1_5-6_fc11:HEAD:globus-gsi-proxy-ssl-1.5-6.fc11.src.rpm:1250882828