[lftp/f15] updated to latest upstream 4.3.3 fixes #666580 - Inaccurate timestamps

Jiri Skala jskala at fedoraproject.org
Wed Nov 16 12:44:35 UTC 2011


commit a584e9e3268b07a67f2cd02479769eb6d87c7648
Author: Jiri Skala <jskala at redhat.com>
Date:   Wed Nov 16 13:44:30 2011 +0100

    updated to latest upstream 4.3.3
    fixes #666580 - Inaccurate timestamps

 .gitignore              |    1 +
 lftp-4.3.3-tmprec.patch |   25 +++++++++++++++++++++++++
 lftp.spec               |    8 +++++++-
 sources                 |    2 +-
 4 files changed, 34 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 903e06a..50841d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ lftp-4.0.10.tar.xz
 /lftp-4.1.2.tar.xz
 /lftp-4.1.3.tar.xz
 /lftp-4.2.1.tar.xz
+/lftp-4.3.3.tar.xz
diff --git a/lftp-4.3.3-tmprec.patch b/lftp-4.3.3-tmprec.patch
new file mode 100644
index 0000000..88b4475
--- /dev/null
+++ b/lftp-4.3.3-tmprec.patch
@@ -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.
diff --git a/lftp.spec b/lftp.spec
index e789735..9f3c78a 100644
--- a/lftp.spec
+++ b/lftp.spec
@@ -1,6 +1,6 @@
 Summary:	A sophisticated file transfer program
 Name:		lftp
-Version:	4.2.1
+Version:	4.3.3
 Release:	1%{?dist}
 License:	GPLv3+
 Group:		Applications/Internet
@@ -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.3.3-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,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Apr 04 2011 Jiri Skala <jskala at redhat.com> - 4.3.3-1
+- updated to latest upstream 4.3.3
+- fixes #666580 - Inaccurate timestamps
+
 * Mon Apr 04 2011 Jiri Skala <jskala at redhat.com> - 4.2.1-1
 - updated to latest upstream 4.2.1
 
diff --git a/sources b/sources
index 78abfff..fa3cd8f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-737912baf3ea576f2ed52eeebb14491b  lftp-4.2.1.tar.xz
+7ff6217036e551020247ce74495f78c5  lftp-4.3.3.tar.xz


More information about the scm-commits mailing list