From 49cf3dd4715b1b3fc7d72754cce6cda83a507ae3 Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Jun 22 2010 17:35:12 +0000 Subject: - fixes #600218 - [abrt] Process /usr/bin/lftp was killed by signal 1 --- diff --git a/lftp-4.0.9-date_fmt.patch b/lftp-4.0.9-date_fmt.patch new file mode 100644 index 0000000..afe1f38 --- /dev/null +++ b/lftp-4.0.9-date_fmt.patch @@ -0,0 +1,22 @@ +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-22 18:33:41.293950484 +0200 +@@ -562,16 +562,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<0xFFFFFFFF) + { + 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; diff --git a/lftp.spec b/lftp.spec index a9f52ae..5980ec2 100644 --- a/lftp.spec +++ b/lftp.spec @@ -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 22 2010 Jiri Skala - 4.0.9-2 +- fixes #600218 - [abrt] Process /usr/bin/lftp was killed by signal 1 + * Mon Jun 14 2010 Jiri Skala - 4.0.9-1 - updated to latest stable version