rpms/lftp/F-12 lftp-4.0.9-date_fmt.patch, NONE, 1.1 .cvsignore, 1.45, 1.46 lftp.spec, 1.90, 1.91 sources, 1.45, 1.46 lftp-4.0.5-manconf.patch, 1.1, NONE

[Jiri Skala]

Author: jskala

Update of /cvs/extras/rpms/lftp/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11779

Modified Files:
	.cvsignore lftp.spec sources 
Added Files:
	lftp-4.0.9-date_fmt.patch 
Removed Files:
	lftp-4.0.5-manconf.patch 
Log Message:
* Tue Jun 30 2010 Jiri Skala <jskala at redhat.com> - 4.0.9-1
- fixes #600218 - formatting corrupted date
- updated to latest version


lftp-4.0.9-date_fmt.patch:
 Http.cc |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

--- NEW FILE lftp-4.0.9-date_fmt.patch ---
diff -up lftp-4.0.9/src/Http.cc.date_fmt lftp-4.0.9/src/Http.cc
--- lftp-4.0.9/src/Http.cc.date_fmt	2009-07-17 14:52:26.000000000 +0200
+++ lftp-4.0.9/src/Http.cc	2010-06-30 08:07:00.818994525 +0200
@@ -29,6 +29,7 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <time.h>
+#include <limits.h>
 #include <fnmatch.h>
 #include <locale.h>
 #include "Http.h"
@@ -562,16 +563,10 @@ void Http::SendRequest(const char *conne
 		     (long long)((limit==FILE_END || limit>entity_size ? entity_size : limit)-1),
 		     (long long)entity_size);
       }
-      if(entity_date!=NO_DATE)
+      if(entity_date!=NO_DATE && entity_date>0L && entity_date<INT_MAX)
       {
 	 char d[256];
-	 static const char weekday_names[][4]={
-	    "Sun","Mon","Tue","Wed","Thu","Fri","Sat"
-	 };
-	 struct tm *t=gmtime(&entity_date);
-	 sprintf(d,"%s, %2d %s %04d %02d:%02d:%02d GMT",
-	    weekday_names[t->tm_wday],t->tm_mday,month_names[t->tm_mon],
-	    t->tm_year+1900,t->tm_hour,t->tm_min,t->tm_sec);
+	 strftime(d, sizeof(d), "%a, %d %b %H:%M:%S %Y GMT", gmtime(&entity_date));
 	 Send("Last-Modified: %s\r\n",d);
       }
       break;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lftp/F-12/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	11 Jun 2010 11:37:57 -0000	1.45
+++ .cvsignore	30 Jun 2010 06:48:46 -0000	1.46
@@ -1 +1 @@
-lftp-4.0.8.tar.lzma
+lftp-4.0.9.tar.lzma


Index: lftp.spec
===================================================================
RCS file: /cvs/extras/rpms/lftp/F-12/lftp.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- lftp.spec	11 Jun 2010 11:37:57 -0000	1.90
+++ lftp.spec	30 Jun 2010 06:48:47 -0000	1.91
@@ -1,6 +1,6 @@
 Summary:	A sophisticated file transfer program
 Name:		lftp
-Version:	4.0.8
+Version:	4.0.9
 Release:	1%{?dist}
 License:	GPLv3+
 Group:		Applications/Internet
@@ -9,7 +9,7 @@ URL:		http://lftp.yar.ru/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ncurses-devel, gnutls-devel, pkgconfig, readline-devel, gettext
 
-Patch1: lftp-4.0.5-manconf.patch
+Patch1: lftp-4.0.9-date_fmt.patch
 
 %description
 LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job
@@ -29,7 +29,7 @@ Utility scripts for use with lftp.
 %prep
 %setup -q
 
-%patch1 -p1 -b .manconf
+%patch1 -p1 -b .date_fmt
 
 #sed -i.rpath -e '/lftp_cv_openssl/s|-R.*lib||' configure
 sed -i.norpath -e \
@@ -92,6 +92,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun 30 2010 Jiri Skala <jskala at redhat.com> - 4.0.9-1
+- fixes #600218 - formatting corrupted date
+- updated to latest version
+
 * Fri Jun 11 2010 Jiri Skala <jskala at redhat.com> - 4.0.8-1
 - fixes #602836 - CVE-2010-2251 lftp: multiple HTTP client download filename vulnerability
 - updated to latest version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lftp/F-12/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	11 Jun 2010 11:37:57 -0000	1.45
+++ sources	30 Jun 2010 06:48:47 -0000	1.46
@@ -1 +1 @@
-a8900b3481b1f8e2be7f01e6acfedbae  lftp-4.0.8.tar.lzma
+b3d584d12fd04037916882b1a00f2f92  lftp-4.0.9.tar.lzma


--- lftp-4.0.5-manconf.patch DELETED ---