From a5222c1cb2078df3a6f90bb9444b821cc384da89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= Date: Thu, 5 Apr 2018 12:34:02 +0200 Subject: [PATCH] Improve documentation of better_stou in the man page --- ...ation-of-better_stou-in-the-man-page.patch | 30 +++++++++++++++++++ vsftpd.spec | 6 +++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0001-Improve-documentation-of-better_stou-in-the-man-page.patch diff --git a/0001-Improve-documentation-of-better_stou-in-the-man-page.patch b/0001-Improve-documentation-of-better_stou-in-the-man-page.patch new file mode 100644 index 0000000..e1293ab --- /dev/null +++ b/0001-Improve-documentation-of-better_stou-in-the-man-page.patch @@ -0,0 +1,30 @@ +From 765f99b26705c8d6fe2be4feb07f4c91e7eb96f9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= +Date: Thu, 5 Apr 2018 12:29:03 +0200 +Subject: [PATCH] Improve documentation of better_stou in the man page + +--- + vsftpd.conf.5 | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/vsftpd.conf.5 b/vsftpd.conf.5 +index 6911a73..e9ae474 100644 +--- a/vsftpd.conf.5 ++++ b/vsftpd.conf.5 +@@ -68,7 +68,12 @@ trick the C library into loading a user-created configuration file from the + Default: NO + .TP + .B better_stou +-Use better file name generation algorithm for the STOU command. ++Use a better file name generation algorithm for the STOU command. The default ++original algorithm simply adds an increasing number suffix to the file name, ++which is prone to race conditions if multiple uploaders use the STOU command ++with the same file name simultaneously, which can result in failure of the ++command. The new algorithm adds a unique random six character suffix to ++the file name, which works much better in face of concurrent uploads. + + Default: NO + .TP +-- +2.14.3 + diff --git a/vsftpd.spec b/vsftpd.spec index cfd4e2c..bfd1d68 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -2,7 +2,7 @@ Name: vsftpd Version: 3.0.3 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Very Secure Ftp Daemon Group: System Environment/Daemons @@ -79,6 +79,7 @@ Patch47: 0047-Disable-tcp_wrappers-support.patch Patch48: 0048-Fix-default-value-of-strict_ssl_read_eof-in-man-page.patch Patch49: 0049-Add-new-filename-generation-algorithm-for-STOU-comma.patch Patch50: 0050-Don-t-link-with-libnsl.patch +Patch51: 0001-Improve-documentation-of-better_stou-in-the-man-page.patch %description vsftpd is a Very Secure FTP daemon. It was written completely from @@ -148,6 +149,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_var}/ftp/pub %{_var}/ftp %changelog +* Thu Apr 05 2018 Ondřej Lysoněk - 3.0.3-21 +- Improve documentation of better_stou in the man page + * Mon Feb 19 2018 Ondřej Lysoněk - 3.0.3-20 - Add gcc to BuildRequires