rpms/ice/devel Ice-3.3.1-openssl.patch,NONE,1.1 ice.spec,1.34,1.35

[Tomáš Mráz]

Author: tmraz

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

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


Ice-3.3.1-openssl.patch:
 Instance.cpp |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE Ice-3.3.1-openssl.patch ---
diff -up Ice-3.3.1/cpp/src/IceSSL/Instance.cpp.openssl Ice-3.3.1/cpp/src/IceSSL/Instance.cpp
--- Ice-3.3.1/cpp/src/IceSSL/Instance.cpp.openssl	2009-03-20 18:52:14.000000000 +0100
+++ Ice-3.3.1/cpp/src/IceSSL/Instance.cpp	2009-08-22 17:14:03.000000000 +0200
@@ -989,7 +989,13 @@ IceSSL::Instance::traceConnection(SSL* s
 {
     Trace out(_logger, _securityTraceCategory);
     out << "SSL summary for " << (incoming ? "incoming" : "outgoing") << " connection\n";
-    SSL_CIPHER* cipher = SSL_get_current_cipher(ssl);
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+    const SSL_CIPHER *cipher;
+#else
+    SSL_CIPHER *cipher;
+#endif
+
+    cipher = SSL_get_current_cipher(ssl);
     if(!cipher)
     {
         out << "unknown cipher\n";


Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/devel/ice.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- ice.spec	21 Aug 2009 13:56:00 -0000	1.34
+++ ice.spec	22 Aug 2009 15:16:23 -0000	1.35
@@ -36,6 +36,8 @@ Patch5:         patch-rand.txt
 
 Patch6:         ice-php53.patch
 
+Patch7:         Ice-3.3.1-openssl.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Ice doesn't officially support ppc64 at all
@@ -186,6 +188,7 @@ The Ice runtime for PHP applications.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 %setup -q -n Ice-rpmbuild-%{version} -T -b 1
 %setup -q -n Ice-3.3.0-man-pages -T -b 2
 
@@ -547,7 +550,7 @@ fi
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.1-5
+* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 3.3.1-5
 - rebuilt with new openssl
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.1-4