rpms/kvirc/devel kvirc-openssl.patch,NONE,1.1 kvirc.spec,1.3,1.4

[Tomáš Mráz]

Author: tmraz

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

Modified Files:
	kvirc.spec 
Added Files:
	kvirc-openssl.patch 
Log Message:
* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 4.0.0-0.8.20090409svn3173
- rebuilt with new openssl


kvirc-openssl.patch:
 kvi_ssl.cpp |    9 ++++++++-
 kvi_ssl.h   |    4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

--- NEW FILE kvirc-openssl.patch ---
diff -up kvirc/src/kvilib/net/kvi_ssl.cpp.openssl kvirc/src/kvilib/net/kvi_ssl.cpp
--- kvirc/src/kvilib/net/kvi_ssl.cpp.openssl	2008-11-22 18:16:20.000000000 +0100
+++ kvirc/src/kvilib/net/kvi_ssl.cpp	2009-08-25 16:35:41.000000000 +0200
@@ -474,7 +474,11 @@ KviSSLCertificate * KviSSL::getPeerCerti
 KviSSLCipherInfo * KviSSL::getCurrentCipherInfo()
 {
 	if(!m_pSSL)return 0;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+	const SSL_CIPHER * c = SSL_get_current_cipher(m_pSSL);
+#else
 	SSL_CIPHER * c = SSL_get_current_cipher(m_pSSL);
+#endif
 	if(!c)return 0;
 	return new KviSSLCipherInfo(c);
 }
@@ -652,8 +656,11 @@ const char * KviSSLCertificate::verify()
 }
 */
 
-
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+KviSSLCipherInfo::KviSSLCipherInfo(const SSL_CIPHER * c)
+#else
 KviSSLCipherInfo::KviSSLCipherInfo(SSL_CIPHER * c)
+#endif
 {
 	m_szVersion = SSL_CIPHER_get_version(c);
 	m_iNumBitsUsed = SSL_CIPHER_get_bits(c,&m_iNumBits);
diff -up kvirc/src/kvilib/net/kvi_ssl.h.openssl kvirc/src/kvilib/net/kvi_ssl.h
--- kvirc/src/kvilib/net/kvi_ssl.h.openssl	2008-09-18 04:11:05.000000000 +0200
+++ kvirc/src/kvilib/net/kvi_ssl.h	2009-08-25 16:36:59.000000000 +0200
@@ -100,7 +100,11 @@ public:
 class KVILIB_API KviSSLCipherInfo
 {
 public:
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+	KviSSLCipherInfo(const SSL_CIPHER * c);
+#else
 	KviSSLCipherInfo(SSL_CIPHER * c);
+#endif
 	~KviSSLCipherInfo();
 protected:
 	KviStr       m_szVersion;


Index: kvirc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvirc/devel/kvirc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- kvirc.spec	21 Aug 2009 14:11:40 -0000	1.3
+++ kvirc.spec	25 Aug 2009 14:38:52 -0000	1.4
@@ -13,6 +13,7 @@ URL:              http://kvirc.net/
 #  tar -cjf kvirc-20090409svn3173.tar.bz2 kvirc
 Source0:          %{name}-%{pre}.tar.bz2
 Patch0:           kvirc-flags.patch
+Patch1:           kvirc-openssl.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    kdelibs4-devel audiofile-devel glib2-devel
 BuildRequires:    python-devel perl-ExtUtils-Embed dbus-devel
@@ -29,6 +30,7 @@ many IRC addicted developers around the 
 %prep
 %setup -q -n %{name}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{cmake}
@@ -119,7 +121,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_datadir}/%{name}/4.0/doc/README
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4.0.0-0.8.20090409svn3173
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 4.0.0-0.8.20090409svn3173
 - rebuilt with new openssl
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.0-0.7.20090409svn3173