Compare commits
No commits in common. "c8" and "c8-beta" have entirely different histories.
@ -1,11 +1,14 @@
|
|||||||
commit de556b2643b5da622f501b435740c651b9f82554
|
From ba0520650ae7f9f63e48ba9fb3a94297aebe2d0c Mon Sep 17 00:00:00 2001
|
||||||
Author: Tomas Korbar <tkorbar@redhat.com>
|
From: Martin Sehnoutka <msehnout@redhat.com>
|
||||||
Date: Mon Dec 15 02:00:00 2025 +0200
|
Date: Wed, 7 Sep 2016 14:22:21 +0200
|
||||||
|
Subject: [PATCH 14/59] Add support for square brackets in ls.
|
||||||
|
|
||||||
Add support for square brackets in ls.
|
---
|
||||||
|
ls.c | 222 +++++++++++++++++++++++++++++++++++++++++++++----------------------
|
||||||
|
1 file changed, 150 insertions(+), 72 deletions(-)
|
||||||
|
|
||||||
diff --git a/ls.c b/ls.c
|
diff --git a/ls.c b/ls.c
|
||||||
index 616b2d9..ab69af9 100644
|
index 616b2d9..b840136 100644
|
||||||
--- a/ls.c
|
--- a/ls.c
|
||||||
+++ b/ls.c
|
+++ b/ls.c
|
||||||
@@ -246,7 +246,7 @@ vsf_filename_passes_filter(const struct mystr* p_filename_str,
|
@@ -246,7 +246,7 @@ vsf_filename_passes_filter(const struct mystr* p_filename_str,
|
||||||
@ -188,7 +191,7 @@ index 616b2d9..ab69af9 100644
|
|||||||
- if (vsf_filename_passes_filter(&name_remain_str, &new_filter_str,
|
- if (vsf_filename_passes_filter(&name_remain_str, &new_filter_str,
|
||||||
- iters))
|
- iters))
|
||||||
+ unsigned int cur_pos;
|
+ unsigned int cur_pos;
|
||||||
+ unsigned char stch, ench;
|
+ char stch, ench;
|
||||||
+ const char *p_brace;
|
+ const char *p_brace;
|
||||||
+
|
+
|
||||||
+ str_split_char(&filter_remain_str, &temp_str, ']');
|
+ str_split_char(&filter_remain_str, &temp_str, ']');
|
||||||
@ -213,7 +216,7 @@ index 616b2d9..ab69af9 100644
|
|||||||
+ cur_pos++;
|
+ cur_pos++;
|
||||||
+ }
|
+ }
|
||||||
+ // expand char[s]
|
+ // expand char[s]
|
||||||
+ for (;stch <= ench && !str_isempty(&brace_list_str) && stch != 0; stch++)
|
+ for (;stch <= ench && !str_isempty(&brace_list_str); stch++)
|
||||||
+ {
|
+ {
|
||||||
+ str_empty(&new_filter_str);
|
+ str_empty(&new_filter_str);
|
||||||
+ if (!matched)
|
+ if (!matched)
|
||||||
@ -269,3 +272,6 @@ index 616b2d9..ab69af9 100644
|
|||||||
}
|
}
|
||||||
/* Any incoming string left means no match unless we ended on the correct
|
/* Any incoming string left means no match unless we ended on the correct
|
||||||
* type of wildcard.
|
* type of wildcard.
|
||||||
|
--
|
||||||
|
2.14.4
|
||||||
|
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Name: vsftpd
|
Name: vsftpd
|
||||||
Version: 3.0.3
|
Version: 3.0.3
|
||||||
Release: 36%{?dist}.3
|
Release: 36%{?dist}
|
||||||
Summary: Very Secure Ftp Daemon
|
Summary: Very Secure Ftp Daemon
|
||||||
|
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
@ -165,18 +165,6 @@ mkdir -p $RPM_BUILD_ROOT/%{_var}/ftp/pub
|
|||||||
%{_var}/ftp
|
%{_var}/ftp
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Dec 17 2025 Tomas Korbar <tkorbar@redhat.com> - 3.0.3-36.3
|
|
||||||
- Rebuild to test with proper configuration
|
|
||||||
- Related: RHEL-134160
|
|
||||||
|
|
||||||
* Wed Dec 17 2025 Tomas Korbar <tkorbar@redhat.com> - 3.0.3-36.2
|
|
||||||
- Rebuild to test with proper configuration
|
|
||||||
- Related: RHEL-134160
|
|
||||||
|
|
||||||
* Wed Dec 17 2025 Tomas Korbar <tkorbar@redhat.com> - 3.0.3-36.1
|
|
||||||
- Fix CVE-2025-14242
|
|
||||||
- Resolves: RHEL-134160
|
|
||||||
|
|
||||||
* Thu Apr 06 2023 Richard Lescak <rlescak@redhat.com> -3.0.3-36
|
* Thu Apr 06 2023 Richard Lescak <rlescak@redhat.com> -3.0.3-36
|
||||||
- add patch to provide option for TLSv1.3 ciphersuites
|
- add patch to provide option for TLSv1.3 ciphersuites
|
||||||
- Resolves: rhbz#2069733
|
- Resolves: rhbz#2069733
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user