From 5aab3039e57f32761c188ebda5b1531b33cd045e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Sat, 22 Aug 2009 18:43:51 +0000 Subject: [PATCH] - rebuilt with new openssl --- vsftpd-2.2.0-openssl.patch | 15 +++++++++++++++ vsftpd.spec | 4 +++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 vsftpd-2.2.0-openssl.patch diff --git a/vsftpd-2.2.0-openssl.patch b/vsftpd-2.2.0-openssl.patch new file mode 100644 index 0000000..23dc498 --- /dev/null +++ b/vsftpd-2.2.0-openssl.patch @@ -0,0 +1,15 @@ +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); diff --git a/vsftpd.spec b/vsftpd.spec index 6e5b14d..98efbc5 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -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 - 2.2.0-0.2.pre4 +* Sat Aug 22 2009 Tomas Mraz - 2.2.0-0.2.pre4 - rebuilt with new openssl * Tue Aug 04 2009 Martin Nagy - 2.2.0-0.1.pre4