rpms/lftp/F-13 lftp-4.0.9-date_fmt.patch, NONE, 1.1 lftp.spec, 1.93, 1.94

[Jiri Skala]

Author: jskala

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

Modified Files:
	lftp.spec 
Added Files:
	lftp-4.0.9-date_fmt.patch 
Log Message:
* Tue Jun 30 2010 Jiri Skala <jskala at redhat.com> - 4.0.9-2
- fixes #600218 - formatting corrupted date


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: lftp.spec
===================================================================
RCS file: /cvs/extras/rpms/lftp/F-13/lftp.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- lftp.spec	15 Jun 2010 07:39:41 -0000	1.93
+++ lftp.spec	30 Jun 2010 06:37:14 -0000	1.94
@@ -1,7 +1,7 @@
 Summary:	A sophisticated file transfer program
 Name:		lftp
 Version:	4.0.9
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv3+
 Group:		Applications/Internet
 Source0:	ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.lzma
@@ -9,6 +9,8 @@ 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.9-date_fmt.patch
+
 %description
 LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job
 control and uses the readline library for input. It has bookmarks, built-in
@@ -27,6 +29,8 @@ Utility scripts for use with lftp.
 %prep
 %setup -q
 
+%patch1 -p1 -b .date_fmt
+
 #sed -i.rpath -e '/lftp_cv_openssl/s|-R.*lib||' configure
 sed -i.norpath -e \
 	'/sys_lib_dlsearch_path_spec/s|/usr/lib |/usr/lib /usr/lib64 /lib64 |' \
@@ -88,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun 30 2010 Jiri Skala <jskala at redhat.com> - 4.0.9-2
+- fixes #600218 - formatting corrupted date
+
 * Tue Jun 15 2010 Jiri Skala <jskala at redhat.com> - 4.0.9-1
 - update to latest upstream
 - fixes #604004