From 49e72388a965ba938a6f5fed372a0c7c84bdec19 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Fri, 16 Jan 2026 10:04:54 +0000 Subject: [PATCH] Import from CS git --- .vsftpd.metadata | 1 + ...dd-support-for-square-brackets-in-ls.patch | 20 +++++++------------ SPECS/vsftpd.spec | 14 ++++++++++++- 3 files changed, 21 insertions(+), 14 deletions(-) create mode 100644 .vsftpd.metadata diff --git a/.vsftpd.metadata b/.vsftpd.metadata new file mode 100644 index 0000000..8ae172c --- /dev/null +++ b/.vsftpd.metadata @@ -0,0 +1 @@ +d5f5a180dbecd0fbcdc92bf0ba2fc001c962b55a SOURCES/vsftpd-3.0.3.tar.gz diff --git a/SOURCES/0014-Add-support-for-square-brackets-in-ls.patch b/SOURCES/0014-Add-support-for-square-brackets-in-ls.patch index 27f5374..3b9ae69 100644 --- a/SOURCES/0014-Add-support-for-square-brackets-in-ls.patch +++ b/SOURCES/0014-Add-support-for-square-brackets-in-ls.patch @@ -1,14 +1,11 @@ -From ba0520650ae7f9f63e48ba9fb3a94297aebe2d0c Mon Sep 17 00:00:00 2001 -From: Martin Sehnoutka -Date: Wed, 7 Sep 2016 14:22:21 +0200 -Subject: [PATCH 14/59] Add support for square brackets in ls. +commit de556b2643b5da622f501b435740c651b9f82554 +Author: Tomas Korbar +Date: Mon Dec 15 02:00:00 2025 +0200 ---- - ls.c | 222 +++++++++++++++++++++++++++++++++++++++++++++---------------------- - 1 file changed, 150 insertions(+), 72 deletions(-) + Add support for square brackets in ls. diff --git a/ls.c b/ls.c -index 616b2d9..b840136 100644 +index 616b2d9..ab69af9 100644 --- a/ls.c +++ b/ls.c @@ -246,7 +246,7 @@ vsf_filename_passes_filter(const struct mystr* p_filename_str, @@ -191,7 +188,7 @@ index 616b2d9..b840136 100644 - if (vsf_filename_passes_filter(&name_remain_str, &new_filter_str, - iters)) + unsigned int cur_pos; -+ char stch, ench; ++ unsigned char stch, ench; + const char *p_brace; + + str_split_char(&filter_remain_str, &temp_str, ']'); @@ -216,7 +213,7 @@ index 616b2d9..b840136 100644 + cur_pos++; + } + // expand char[s] -+ for (;stch <= ench && !str_isempty(&brace_list_str); stch++) ++ for (;stch <= ench && !str_isempty(&brace_list_str) && stch != 0; stch++) + { + str_empty(&new_filter_str); + if (!matched) @@ -272,6 +269,3 @@ index 616b2d9..b840136 100644 } /* Any incoming string left means no match unless we ended on the correct * type of wildcard. --- -2.14.4 - diff --git a/SPECS/vsftpd.spec b/SPECS/vsftpd.spec index 6280949..6ed880d 100644 --- a/SPECS/vsftpd.spec +++ b/SPECS/vsftpd.spec @@ -2,7 +2,7 @@ Name: vsftpd Version: 3.0.3 -Release: 36%{?dist} +Release: 36%{?dist}.3 Summary: Very Secure Ftp Daemon Group: System Environment/Daemons @@ -165,6 +165,18 @@ mkdir -p $RPM_BUILD_ROOT/%{_var}/ftp/pub %{_var}/ftp %changelog +* Wed Dec 17 2025 Tomas Korbar - 3.0.3-36.3 +- Rebuild to test with proper configuration +- Related: RHEL-134160 + +* Wed Dec 17 2025 Tomas Korbar - 3.0.3-36.2 +- Rebuild to test with proper configuration +- Related: RHEL-134160 + +* Wed Dec 17 2025 Tomas Korbar - 3.0.3-36.1 +- Fix CVE-2025-14242 +- Resolves: RHEL-134160 + * Thu Apr 06 2023 Richard Lescak -3.0.3-36 - add patch to provide option for TLSv1.3 ciphersuites - Resolves: rhbz#2069733