SOURCES/0042-When-handling-FEAT-command-check-ssl_tlsv1_1-and-ssl.patch

@@ -1,32 +0,0 @@
-From 1c280a0b04e58ec63ce9ab5eb8d0ffe5ebbae115 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
-Date: Thu, 21 Dec 2017 14:29:25 +0100
-Subject: [PATCH 42/59] When handling FEAT command, check ssl_tlsv1_1 and
- ssl_tlsv1_2
-
-Send 'AUTH SSL' in reply to the FEAT command when the ssl_tlsv1_1
-or ssl_tlsv1_2 configuration option is enabled.
-
-The patch was written by Martin Sehnoutka.
-
-Resolves: rhbz#1432054
----
- features.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/features.c b/features.c
-index 1212980..d024366 100644
---- a/features.c
-+++ b/features.c
-@@ -22,7 +22,7 @@ handle_feat(struct vsf_session* p_sess)
-     {
-       vsf_cmdio_write_raw(p_sess, " AUTH SSL\r\n");
-     }
--    if (tunable_tlsv1)
-+    if (tunable_tlsv1 || tunable_tlsv1_1 || tunable_tlsv1_2 || tunable_tlsv1_3)
-     {
-       vsf_cmdio_write_raw(p_sess, " AUTH TLS\r\n");
-     }
--- 
-2.14.4
-

SPECS/vsftpd.spec

@@ -2,7 +2,7 @@
 
 Name:    vsftpd
 Version: 3.0.5
-Release: 6%{?dist}
+Release: 5%{?dist}
 Summary: Very Secure Ftp Daemon
 
 # OpenSSL link exception
@@ -61,6 +61,7 @@ Patch29: 0029-Fix-segfault-in-config-file-parser.patch
 Patch30: 0030-Fix-logging-into-syslog-when-enabled-in-config.patch
 Patch31: 0031-Fix-question-mark-wildcard-withing-a-file-name.patch
 Patch32: 0032-Propagate-errors-from-nfs-with-quota-to-client.patch
+#Patch33: 0033-Introduce-TLSv1.1-and-TLSv1.2-options.patch
 Patch34: 0034-Turn-off-seccomp-sandbox-because-it-is-too-strict.patch
 Patch36: 0036-Redefine-VSFTP_COMMAND_FD-to-1.patch
 Patch37: 0037-Document-the-relationship-of-text_userdb_names-and-c.patch
@@ -68,7 +69,8 @@ Patch38: 0038-Document-allow_writeable_chroot-in-the-man-page.patch
 Patch39: 0039-Improve-documentation-of-ASCII-mode-in-the-man-page.patch
 Patch40: 0040-Use-system-wide-crypto-policy.patch
 Patch41: 0041-Document-the-new-default-for-ssl_ciphers-in-the-man-.patch
-Patch42: 0042-When-handling-FEAT-command-check-ssl_tlsv1_1-and-ssl.patch
+#Patch42: 0042-When-handling-FEAT-command-check-ssl_tlsv1_1-and-ssl.patch
+#Patch43: 0043-Enable-only-TLSv1.2-by-default.patch
 Patch44: 0044-Disable-anonymous_enable-in-default-config-file.patch
 Patch45: 0045-Expand-explanation-of-ascii_-options-behaviour-in-ma.patch
 Patch46: 0046-vsftpd.conf-Refer-to-the-man-page-regarding-the-asci.patch
@@ -168,17 +170,10 @@ mkdir -p $RPM_BUILD_ROOT/%{_var}/ftp/pub
 %{_var}/ftp
 
 %changelog
-* Tue Aug 20 2024 Tomas Korbar <tkorbar@redhat.com> - 3.0.5-6
-- Fix FEAT command to list AUTH TLS when TLSv1.3 is enabled
-- Resolves: RHEL-45022
-
 * Thu Apr 27 2023 Richard Lescak <rlescak@redhat.com> - 3.0.5-5
 - add option for TLSv1.3 ciphersuites
 - Resolves: rhbz#2188296
  
-* Fri Apr 14 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 3.0.5-4
-- Rebuilt for MSVSphere 9.2 beta
-
 * Mon Feb 13 2023 Richard Lescak <rlescak@redhat.com> - 3.0.5-4
 - add patch to replace deprecated Openssl functions 
 - Resolves: rhbz#1981411