!22 [sync] PR-21: sync upstream patch
From: @openeuler-sync-bot Reviewed-by: @zengwefeng Signed-off-by: @zengwefeng
This commit is contained in:
commit
045432445e
@ -0,0 +1,27 @@
|
|||||||
|
From cb80e261acad0c17acaf4b4f51b7a66e4d038bda Mon Sep 17 00:00:00 2001
|
||||||
|
From: Rimsky <349157738@qq.com>
|
||||||
|
Date: Tue, 9 Aug 2022 13:15:45 +0800
|
||||||
|
Subject: [PATCH] fill verify_fn for quickly second segmentation violation
|
||||||
|
|
||||||
|
---
|
||||||
|
src/GetFileInfo.cc | 4 ++++
|
||||||
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/GetFileInfo.cc b/src/GetFileInfo.cc
|
||||||
|
index b553544c..bbcf51c0 100644
|
||||||
|
--- a/src/GetFileInfo.cc
|
||||||
|
+++ b/src/GetFileInfo.cc
|
||||||
|
@@ -398,6 +398,10 @@ int GetFileInfo::Do()
|
||||||
|
* also serves as a last attempt to see if the file exists--we
|
||||||
|
* only get here if everything else thinks the path doesn't exist.
|
||||||
|
*/
|
||||||
|
+
|
||||||
|
+ if(!verify_fn)
|
||||||
|
+ MakeVerifyFileName();
|
||||||
|
+
|
||||||
|
FileInfo *fi=new FileInfo(verify_fn);
|
||||||
|
fi->need=need;
|
||||||
|
/* We need to do at least one. */
|
||||||
|
--
|
||||||
|
2.20.1
|
||||||
|
|
||||||
11
lftp.spec
11
lftp.spec
@ -1,7 +1,7 @@
|
|||||||
Summary: A sophisticated file transfer program
|
Summary: A sophisticated file transfer program
|
||||||
Name: lftp
|
Name: lftp
|
||||||
Version: 4.9.2
|
Version: 4.9.2
|
||||||
Release: 3
|
Release: 4
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
URL: http://lftp.yar.ru/
|
URL: http://lftp.yar.ru/
|
||||||
Source0: http://lftp.yar.ru/ftp/%{name}-%{version}.tar.xz
|
Source0: http://lftp.yar.ru/ftp/%{name}-%{version}.tar.xz
|
||||||
@ -11,7 +11,8 @@ BuildRequires: chrpath
|
|||||||
|
|
||||||
Patch0: lftp-4.0.9-date_fmt.patch
|
Patch0: lftp-4.0.9-date_fmt.patch
|
||||||
Patch1: Quit-while-source-file-increased.patch
|
Patch1: Quit-while-source-file-increased.patch
|
||||||
Patch2: backport-fill-verify_fn-in-case-of-cd-error-fix-650.patch
|
Patch2: backport-fill-verify_fn-in-case-of-cd-error-fix-650.patch
|
||||||
|
Patch3: backport-fill-verify_fn-for-quickly-second-segmentation-violation.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
LFTP is a sophisticated file transfer program supporting a number of
|
LFTP is a sophisticated file transfer program supporting a number of
|
||||||
@ -85,6 +86,12 @@ echo "%{_libdir}/lftp/%{version}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arc
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Dec 12 2022 liweiganga <liweiganga@uniontech.com> - 4.9.2-4
|
||||||
|
- Type:bugfix
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:fill verify_fn for quickly second segmentation violation
|
||||||
|
|
||||||
* Thu Jul 14 2022 rimsky <349157738@qq.com> - 4.9.2-3
|
* Thu Jul 14 2022 rimsky <349157738@qq.com> - 4.9.2-3
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user