diff --git a/4.8.28.tar.gz b/4.8.28.tar.gz deleted file mode 100644 index 006f78d..0000000 Binary files a/4.8.28.tar.gz and /dev/null differ diff --git a/4.8.29.tar.gz b/4.8.29.tar.gz new file mode 100644 index 0000000..51d1e55 Binary files /dev/null and b/4.8.29.tar.gz differ diff --git a/Ticket-4374-fix-file-sort-by-version.patch b/Ticket-4374-fix-file-sort-by-version.patch deleted file mode 100644 index 292ab0b..0000000 --- a/Ticket-4374-fix-file-sort-by-version.patch +++ /dev/null @@ -1,31 +0,0 @@ -From db109be8a28f1556495979ee7d1967e982cca6fd Mon Sep 17 00:00:00 2001 -From: Andrew Borodin -Date: Mon, 23 May 2022 20:52:30 +0300 -Subject: [PATCH] Ticket #4374: fix file sort by version. - -Signed-off-by: Andrew Borodin ---- - src/filemanager/dir.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/src/filemanager/dir.c b/src/filemanager/dir.c -index 5862da6f9c..65a80cf12f 100644 ---- a/src/filemanager/dir.c -+++ b/src/filemanager/dir.c -@@ -358,7 +358,15 @@ sort_vers (file_entry_t * a, file_entry_t * b) - int bd = MY_ISDIR (b); - - if (ad == bd || panels_options.mix_all_files) -- return filevercmp (a->fname->str, b->fname->str) * reverse; -+ { -+ int result; -+ -+ result = filevercmp (a->fname->str, b->fname->str); -+ if (result != 0) -+ return result * reverse; -+ -+ return sort_name (a, b); -+ } - - return bd - ad; - } diff --git a/mc.spec b/mc.spec index 1d3d944..ef2257c 100644 --- a/mc.spec +++ b/mc.spec @@ -1,6 +1,6 @@ Name: mc Summary: a feature rich full-screen text mode application -Version: 4.8.28 +Version: 4.8.29 Release: 1 Epoch: 1 License: GPLv3+ @@ -11,8 +11,6 @@ Patch0: %{name}-spec.syntax.patch Patch1: %{name}-python3.patch Patch2: %{name}-default_setup.patch Patch3: %{name}-tmpdir.patch -# https://github.com/MidnightCommander/mc/commit/34d3726b79d35481e96f5fabe8e34e3439e6d9d9.patch -Patch4: Ticket-4374-fix-file-sort-by-version.patch BuildRequires: gcc e2fsprogs-devel glib2-devel gpm-devel groff-base BuildRequires: libssh2-devel >= 1.2.5 perl-generators pkgconfig slang-devel @@ -96,6 +94,9 @@ install contrib/mc.{sh,csh} ${RPM_BUILD_ROOT}%{_sysconfdir}/profile.d %doc doc/FAQ doc/NEWS doc/README %changelog +* Wed Apr 19 2023 wangkai <13474090681@163.com> - 1:4.8.29-1 +- Update to 4.8.29 + * Wed Jul 20 2022 yaoxin - 1:4.8.28-1 - Update to 4.8.28 to fix CVE-2021-36370