new version 4.8.0
This commit is contained in:
parent
49978aea1c
commit
67cfa01064
1
.gitignore
vendored
1
.gitignore
vendored
@ -46,3 +46,4 @@ lftp-4.0.10.tar.xz
|
||||
/lftp-4.7.5.tar.xz
|
||||
/lftp-4.7.6.tar.xz
|
||||
/lftp-4.7.7.tar.xz
|
||||
/lftp-4.8.0.tar.xz
|
||||
|
||||
@ -10,22 +10,21 @@ index 5364c94..0018670 100644
|
||||
#include <fnmatch.h>
|
||||
#include <locale.h>
|
||||
#include <assert.h>
|
||||
@@ -744,15 +745,10 @@ void Http::SendRequest(const char *connection,const char *f)
|
||||
diff --git a/src/Http.cc b/src/Http.cc
|
||||
index b84a729..faf0cc5 100644
|
||||
--- a/src/Http.cc
|
||||
+++ b/src/Http.cc
|
||||
@@ -786,9 +786,11 @@ void Http::SendRequest(const char *connection,const char *f)
|
||||
(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))
|
||||
{
|
||||
- static const char weekday_names[][4]={
|
||||
- "Sun","Mon","Tue","Wed","Thu","Fri","Sat"
|
||||
- };
|
||||
- const struct tm *t=gmtime(&entity_date);
|
||||
- const char *d=xstring::format("%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);
|
||||
- Send("Last-Modified: %s\r\n",FormatLastModified(entity_date).get());
|
||||
+ char d[256];
|
||||
+ strftime(d, sizeof(d), "%a, %d %b %H:%M:%S %Y GMT", gmtime(&entity_date));
|
||||
Send("Last-Modified: %s\r\n",d);
|
||||
+ Send("Last-Modified: %s\r\n",d);
|
||||
Send("X-OC-MTime: %ld\r\n",(long)entity_date); // for OwnCloud
|
||||
}
|
||||
break;
|
||||
|
||||
13
lftp.spec
13
lftp.spec
@ -1,6 +1,6 @@
|
||||
Summary: A sophisticated file transfer program
|
||||
Name: lftp
|
||||
Version: 4.7.7
|
||||
Version: 4.8.0
|
||||
Release: 1%{?dist}
|
||||
License: GPLv3+
|
||||
Group: Applications/Internet
|
||||
@ -9,6 +9,7 @@ URL: http://lftp.yar.ru/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: ncurses-devel, gnutls-devel, perl-generators, pkgconfig, readline-devel, gettext
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
|
||||
Patch1: lftp-4.0.9-date_fmt.patch
|
||||
|
||||
@ -56,6 +57,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/liblftp-jobs.la
|
||||
rm $RPM_BUILD_ROOT%{_libdir}/liblftp-tasks.la
|
||||
rm $RPM_BUILD_ROOT%{_libdir}/liblftp-jobs.so
|
||||
rm $RPM_BUILD_ROOT%{_libdir}/liblftp-tasks.so
|
||||
desktop-file-install \
|
||||
--dir=%{buildroot}%{_datadir}/applications \
|
||||
%{buildroot}/%{_datadir}/applications/lftp.desktop
|
||||
|
||||
%find_lang %{name}
|
||||
|
||||
@ -86,6 +90,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_libdir}/lftp/%{version}/proto-sftp.so
|
||||
%{_libdir}/liblftp-jobs.so.*
|
||||
%{_libdir}/liblftp-tasks.so.*
|
||||
%{_datadir}/applications/lftp.desktop
|
||||
%{_datadir}/icons/hicolor/*/apps/*
|
||||
|
||||
|
||||
|
||||
%files scripts
|
||||
%defattr(-,root,root,-)
|
||||
@ -93,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Jul 14 2017 Michal Ruprich <mruprich@redhat.com> - 4.8.0-1
|
||||
- new version 4.8.0
|
||||
|
||||
* Mon Mar 20 2017 Michal Ruprich <mruprich@redhat.com> - 4.7.7-1
|
||||
- new version 4.7.7
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (lftp-4.7.7.tar.xz) = 25bcb5469a6202be500a350078f604a56e68958210fbed72c59b2c4847fb6b2680335bf668a512055d1e1db84069e13ba5c169a6ca2fefdf77ef6416df261ab7
|
||||
SHA512 (lftp-4.8.0.tar.xz) = 60b437cadbf15479ca1858f2f49d4414e4eb2a2db7af1bb26d82d6ce97652664be8e7c9683c34fb1168ef23950867aea379c3d7705f638bdced392184d890fd4
|
||||
|
||||
Loading…
Reference in New Issue
Block a user