rpms/vsftpd/F-8 vsftpd-2.0.7-ssl_shutdown.patch, NONE, 1.1 vsftpd.spec, 1.67, 1.68

[Martin Nagy]

Author: mnagy

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

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.5-21
- shutdown ssl connection properly (#462317)
- fix license tag


vsftpd-2.0.7-ssl_shutdown.patch:

--- NEW FILE vsftpd-2.0.7-ssl_shutdown.patch ---
diff -up vsftpd-2.0.5/ssl.c.ssl_shutdown vsftpd-2.0.5/ssl.c
--- vsftpd-2.0.5/ssl.c.ssl_shutdown	2006-06-14 23:02:55.000000000 +0200
+++ vsftpd-2.0.5/ssl.c	2008-09-22 00:54:49.000000000 +0200
@@ -266,7 +266,17 @@ ssl_accept(struct vsf_session* p_sess, i
 void
 ssl_data_close(struct vsf_session* p_sess)
 {
-  SSL_free(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);
+  }
 }
 
 void


Index: vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/F-8/vsftpd.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- vsftpd.spec	21 May 2008 13:51:08 -0000	1.67
+++ vsftpd.spec	21 Sep 2008 22:58:51 -0000	1.68
@@ -3,8 +3,8 @@
 Summary: Very Secure Ftp Daemon
 Name: vsftpd
 Version: 2.0.5
-Release: 20%{?dist}
-License: GPL
+Release: 21%{?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
@@ -42,6 +42,7 @@
 Patch27: vsftpd-2.0.5-uniq_rename.patch
 Patch28: vsftpd-2.0.5-anon_umask.patch
 Patch29: vsftpd-2.0.5-pasv_dot.patch
+Patch30: vsftpd-2.0.7-ssl_shutdown.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %if %{tcp_wrappers}
@@ -98,6 +99,7 @@
 %patch27 -p1 -b .uniq_rename
 %patch28 -p1 -b .anon_umask
 %patch29 -p1 -b .pasv_dot
+%patch30 -p1 -b .ssl_shutdown
 
 %build
 %ifarch s390x
@@ -156,6 +158,10 @@
 %{_var}/ftp
 
 %changelog
+* Mon Sep 22 2008 Martin Nagy <mnagy at redhat.com> - 2.0.5-21
+- shutdown ssl connection properly (#462317)
+- fix license tag
+
 * Wed May 21 2008 Martin Nagy <mnagy at redhat.com> - 2.0.5-20
 - fix a small memory leak (#397011)