fixes #666580 - Inaccurate timestamps

This commit is contained in:
Jiri Skala 2011-11-16 13:31:02 +01:00
parent b9a0bc99da
commit 4a7fe6e0d8
2 changed files with 31 additions and 1 deletions

25
lftp-4.3.3-tmprec.patch Normal file
View File

@ -0,0 +1,25 @@
diff -up lftp-4.3.3/src/commands.cc.tmprec lftp-4.3.3/src/commands.cc
--- lftp-4.3.3/src/commands.cc.tmprec 2011-11-16 12:50:49.885538761 +0100
+++ lftp-4.3.3/src/commands.cc 2011-11-16 12:59:34.008576204 +0100
@@ -1542,20 +1542,7 @@ const char *FileSetOutput::parse_argv(co
time_fmt.set("%Y-%m-%d \n%m-%d %H:%M");
else
time_fmt.set(time_style);
- need_exact_time=false;
- if(time_fmt) {
- static const char exact_fmts[][3]={"%H","%M","%S","%N",""};
- int sep=strcspn(time_fmt,"\n|");
- for(int i=0; exact_fmts[i][0]; i++) {
- const char *f=strstr(time_fmt,exact_fmts[i]);
- if(!f)
- continue;
- if(i>1 || sep>f-time_fmt) {
- need_exact_time=true;
- break;
- }
- }
- }
+ need_exact_time = time_fmt && strpbrk(time_fmt, "TrSs");
}
// remove parsed options.

View File

@ -1,7 +1,7 @@
Summary: A sophisticated file transfer program
Name: lftp
Version: 4.3.3
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv3+
Group: Applications/Internet
Source0: ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.xz
@ -11,6 +11,7 @@ BuildRequires: ncurses-devel, gnutls-devel, pkgconfig, readline-devel, gettext
Patch1: lftp-4.0.9-date_fmt.patch
Patch2: lftp-4.2.0-man.patch
Patch3: lftp-4.2.0-tmprec.patch
%description
LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job
@ -32,6 +33,7 @@ Utility scripts for use with lftp.
%patch1 -p1 -b .date_fmt
%patch2 -p1 -b .man
%patch3 -p1 -b .tmprec
#sed -i.rpath -e '/lftp_cv_openssl/s|-R.*lib||' configure
sed -i.norpath -e \
@ -94,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed Nov 16 2011 Jiri Skala <jskala@redhat.com> - 4.3.3-2
- fixes #666580 - Inaccurate timestamps
* Thu Oct 20 2011 Jiri Skala <jskala@redhat.com> - 4.3.3-1
- updated to latest upstream 4.3.3