rpms/vsftpd/devel vsftpd-2.2.0-openssl.patch, NONE, 1.1 vsftpd.spec, 1.95, 1.96

[Tomáš Mráz]

Author: tmraz

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

Modified Files:
	vsftpd.spec 
Added Files:
	vsftpd-2.2.0-openssl.patch 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.0-0.2.pre4
- rebuilt with new openssl


vsftpd-2.2.0-openssl.patch:
 ssl.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE vsftpd-2.2.0-openssl.patch ---
diff -up vsftpd-2.2.0/ssl.c.openssl vsftpd-2.2.0/ssl.c
--- vsftpd-2.2.0/ssl.c.openssl	2009-01-09 21:47:05.000000000 +0100
+++ vsftpd-2.2.0/ssl.c	2009-08-22 20:41:58.000000000 +0200
@@ -537,7 +537,11 @@ get_ssl(struct vsf_session* p_sess, int 
   if (tunable_debug_ssl)
   {
     const char* p_ssl_version = SSL_get_cipher_version(p_ssl);
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+    const SSL_CIPHER* p_ssl_cipher = SSL_get_current_cipher(p_ssl);
+#else
     SSL_CIPHER* p_ssl_cipher = SSL_get_current_cipher(p_ssl);
+#endif
     const char* p_cipher_name = SSL_CIPHER_get_name(p_ssl_cipher);
     X509* p_ssl_cert = SSL_get_peer_certificate(p_ssl);
     int reused = SSL_session_reused(p_ssl);


Index: vsftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- vsftpd.spec	21 Aug 2009 16:22:44 -0000	1.95
+++ vsftpd.spec	22 Aug 2009 18:43:51 -0000	1.96
@@ -48,6 +48,7 @@ Patch9: vsftpd-2.1.0-userlist_log.patch
 
 Patch10: vsftpd-2.1.0-trim.patch
 Patch12: vsftpd-2.1.1-daemonize_plus.patch
+Patch13: vsftpd-2.2.0-openssl.patch
 
 %description
 vsftpd is a Very Secure FTP daemon. It was written completely from
@@ -71,6 +72,7 @@ cp %{SOURCE1} .
 %patch9 -p1 -b .userlist_log
 %patch10 -p1 -b .trim
 %patch12 -p1 -b .daemonize_plus
+%patch13 -p1 -b .openssl
 
 %build
 %ifarch s390x sparcv9 sparc64
@@ -135,7 +137,7 @@ fi
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.0-0.2.pre4
+* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.0-0.2.pre4
 - rebuilt with new openssl
 
 * Tue Aug 04 2009 Martin Nagy <mnagy at redhat.com> - 2.2.0-0.1.pre4