rpms/gsoap/devel gsoap-2.7-openssl.patch, NONE, 1.1 gsoap.spec, 1.14, 1.15

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/gsoap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6306

Modified Files:
	gsoap.spec 
Added Files:
	gsoap-2.7-openssl.patch 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.7.12-5
- rebuilt with new openssl


gsoap-2.7-openssl.patch:
 stdsoap2.cpp |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE gsoap-2.7-openssl.patch ---
diff -up gsoap-2.7/gsoap/stdsoap2.cpp.openssl gsoap-2.7/gsoap/stdsoap2.cpp
--- gsoap-2.7/gsoap/stdsoap2.cpp.openssl	2008-10-02 19:36:28.000000000 +0200
+++ gsoap-2.7/gsoap/stdsoap2.cpp	2009-08-22 22:20:49.000000000 +0200
@@ -4153,7 +4153,12 @@ again:
           { X509_EXTENSION *ext = X509_get_ext(peer, i);
             const char *ext_str = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
             if (ext_str && !strcmp(ext_str, "subjectAltName"))
-            { X509V3_EXT_METHOD *meth = X509V3_EXT_get(ext);
+            {
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
+              const X509V3_EXT_METHOD *meth = X509V3_EXT_get(ext);
+#else
+              X509V3_EXT_METHOD *meth = X509V3_EXT_get(ext);
+#endif
               void *ext_data;
 #if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
               const unsigned char *data;


Index: gsoap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gsoap/devel/gsoap.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- gsoap.spec	21 Aug 2009 13:46:43 -0000	1.14
+++ gsoap.spec	22 Aug 2009 20:48:19 -0000	1.15
@@ -8,6 +8,7 @@ URL: http://gsoap2.sourceforge.net
 Source0: http://downloads.sourceforge.net/gsoap2/gsoap_2.7.12.tar.gz
 Patch0: use_libtool-2.7.12.patch
 Patch1: unused_args.patch
+Patch2: gsoap-2.7-openssl.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: flex
@@ -48,6 +49,7 @@ gSOAP generated stubs
 
 %patch1 -p1
 
+%patch2 -p1
 # a number of ~ files are distribute, but we do not want them
 find . -name "*~" -exec rm {} \;
 
@@ -249,7 +251,7 @@ make check
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.7.12-5
+* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.7.12-5
 - rebuilt with new openssl
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.12-4