diff -u vsftpd-2.0.6/debian/patches/series vsftpd-2.0.6/debian/patches/series --- vsftpd-2.0.6/debian/patches/series +++ vsftpd-2.0.6/debian/patches/series @@ -4,0 +5 @@ +fix-ssl-shutdown.patch diff -u vsftpd-2.0.6/debian/changelog vsftpd-2.0.6/debian/changelog --- vsftpd-2.0.6/debian/changelog +++ vsftpd-2.0.6/debian/changelog @@ -1,3 +1,13 @@ +vsftpd (2.0.6-1ubuntu1.1) hardy-proposed; urgency=low + + * Added fix-ssl-shutdown.patch (LP: #254905): + - Properly close SSL connections, fixing incompatibility with clients such + as recent FileZilla + - Bug fixed upstream in 2.0.7 + - Patch taken from Fedora, thanks! + + -- Adrien Cunin Sat, 27 Sep 2008 15:07:01 +0200 + vsftpd (2.0.6-1ubuntu1) hardy; urgency=low * Merge from Debian unstable, remaining changes: only in patch2: unchanged: --- vsftpd-2.0.6.orig/debian/patches/fix-ssl-shutdown.patch +++ vsftpd-2.0.6/debian/patches/fix-ssl-shutdown.patch @@ -0,0 +1,21 @@ +Index: vsftpd-2.0.6/ssl.c +=================================================================== +--- vsftpd-2.0.6.orig/ssl.c 2008-09-27 15:05:40.000000000 +0200 ++++ vsftpd-2.0.6/ssl.c 2008-09-27 15:06:06.000000000 +0200 +@@ -282,8 +282,15 @@ + void + ssl_data_close(struct vsf_session* p_sess) + { +- if (p_sess->p_data_ssl) ++ SSL* p_ssl = p_sess->p_data_ssl; ++ if (p_ssl) + { ++ int ret; ++ ret = SSL_shutdown(p_ssl); ++ if (ret == 0) ++ { ++ SSL_shutdown(p_ssl); ++ } + SSL_free(p_sess->p_data_ssl); + p_sess->p_data_ssl = NULL; + }