import CS vsftpd-3.0.5-8.el9

This commit is contained in:
AlmaLinux RelEng Bot 2026-03-30 11:12:57 -04:00
parent a8ed35515e
commit 50dc39c7be
3 changed files with 21 additions and 14 deletions

View File

@ -1,14 +1,11 @@
From ba0520650ae7f9f63e48ba9fb3a94297aebe2d0c Mon Sep 17 00:00:00 2001
From: Martin Sehnoutka <msehnout@redhat.com>
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 <tkorbar@redhat.com>
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

View File

@ -0,0 +1,2 @@
d /var/ftp 0755 root root -
d /var/ftp/pub 0755 root root -

View File

@ -2,7 +2,7 @@
Name: vsftpd
Version: 3.0.5
Release: 6%{?dist}
Release: 8%{?dist}
Summary: Very Secure Ftp Daemon
# OpenSSL link exception
@ -18,6 +18,7 @@ Source7: vsftpd.service
Source8: vsftpd@.service
Source9: vsftpd.target
Source10: vsftpd-generator
Source11: vsftpd-tmpfiles.conf
BuildRequires: make
BuildRequires: pam-devel
@ -137,6 +138,7 @@ install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_unitdir}
install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_unitdir}
install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_unitdir}
install -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{_generatorsdir}
install -Dpm 644 %{SOURCE11} $RPM_BUILD_ROOT%{_tmpfilesdir}/vsftpd.conf
mkdir -p $RPM_BUILD_ROOT/%{_var}/ftp/pub
@ -166,8 +168,17 @@ mkdir -p $RPM_BUILD_ROOT/%{_var}/ftp/pub
%{_mandir}/man5/vsftpd.conf.*
%{_mandir}/man8/vsftpd.*
%{_var}/ftp
%{_tmpfilesdir}/vsftpd.conf
%changelog
* Fri Jan 16 2026 Tomas Korbar <tkorbar@redhat.com> - 3.0.5-8
- Fix CVE-2025-14242
- Resolves: RHEL-134170
* Wed Dec 17 2025 Fedor Vorobev <fvorobev@redhat.com> - 3.0.5-7
- Add a tmpfiles.d config.
- Resolves: RHEL-133075
* 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