rpms/vsftpd/F-9 vsftpd-2.0.7-ssl_shutdown.patch, NONE, 1.1 vsftpd.spec, 1.81, 1.82

[Martin Nagy]

Author: mnagy

Update of /cvs/extras/rpms/vsftpd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19504

Modified Files:
	vsftpd.spec 
Added Files:
	vsftpd-2.0.7-ssl_shutdown.patch 
Log Message:
* Mon Sep 22 2008 Martin Nagy <mnagy at redhat.com> - 2.0.6-6
- shutdown ssl connection properly (#463119)
- fix license tag


vsftpd-2.0.7-ssl_shutdown.patch:

--- NEW FILE vsftpd-2.0.7-ssl_shutdown.patch ---
diff -up vsftpd-2.0.6/ssl.c.ssl_shutdown vsftpd-2.0.6/ssl.c
--- vsftpd-2.0.6/ssl.c.ssl_shutdown	2008-09-22 00:08:46.000000000 +0200
+++ vsftpd-2.0.6/ssl.c	2008-09-22 00:11:31.000000000 +0200
@@ -282,8 +282,15 @@ ssl_write_str(void* p_ssl, const struct 
 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;
   }


Index: vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/F-9/vsftpd.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- vsftpd.spec	20 Jun 2008 21:00:02 -0000	1.81
+++ vsftpd.spec	21 Sep 2008 22:59:45 -0000	1.82
@@ -3,8 +3,8 @@
 Summary: Very Secure Ftp Daemon
 Name: vsftpd
 Version: 2.0.6
-Release: 5%{?dist}
-License: GPL
+Release: 6%{?dist}
+License: GPLv2 with exceptions
 Group: System Environment/Daemons
 URL: http://vsftpd.beasts.org/
 Source: ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}.tar.gz
@@ -44,6 +44,7 @@
 Patch36: vsftpd-2.0.5-greedy.patch
 Patch37: vsftpd-2.0.6-userlist_log.patch
 Patch38: vsftpd-2.0.6-listen.patch
+Patch39: vsftpd-2.0.7-ssl_shutdown.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %if %{tcp_wrappers}
@@ -102,6 +103,7 @@
 %patch36 -p1 -b .greedy
 %patch37 -p1 -b .userlist_log
 %patch38 -p1 -b .listen
+%patch39 -p1 -b .ssl_shutdown
 
 %build
 %ifarch s390x sparcv9 sparc64
@@ -160,6 +162,10 @@
 %{_var}/ftp
 
 %changelog
+* Mon Sep 22 2008 Martin Nagy <mnagy at redhat.com> - 2.0.6-6
+- shutdown ssl connection properly (#463119)
+- fix license tag
+
 * Fri Jun 20 2008 Dennis Gilmore <dennis at ausil.us> - 2.0.6-5
 - add sparc arches to -fPIE list