From: Schantl Stefan <Stevee@ipfire.org>
Date: Sat, 1 May 2010 18:10:39 +0000 (+0200)
Subject: vsftpd: Update to version 2.2.2.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29055d7be707f82c467af6cf0c6faa6c69f0407d;p=ipfire-3.x.git

vsftpd: Update to version 2.2.2.
---

diff --git a/pkgs/core/vsftpd/patches/vsftpd-2.2.0-openssl.patch b/pkgs/core/vsftpd/patches/vsftpd-2.2.0-openssl.patch
new file mode 100644
index 000000000..23dc4980e
--- /dev/null
+++ b/pkgs/core/vsftpd/patches/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/pkgs/core/vsftpd/vsftpd.nm b/pkgs/core/vsftpd/vsftpd.nm
index a2d85b8b0..c26ec545f 100644
--- a/pkgs/core/vsftpd/vsftpd.nm
+++ b/pkgs/core/vsftpd/vsftpd.nm
@@ -25,7 +25,7 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = vsftpd
-PKG_VER        = 2.2.1
+PKG_VER        = 2.2.2
 PKG_REL        = 0
 
 PKG_MAINTAINER =