rpms/lftp
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- fixes issue when some servers require forcing SSL3.0

Browse Source 
- corrected check for 'max time' used for fix #600218
This commit is contained in:
Jiri Skala 2010-06-30 06:19:12 +00:00
parent 49cf3dd471
commit ec9d726414
3 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lftp-4.0.9-date_fmt.patch
View File

@ -1,12 +1,20 @@
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
+++ 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<0xFFFFFFFF)
+ if(entity_date!=NO_DATE && entity_date>0L && entity_date<INT_MAX)
{
char d[256];
- static const char weekday_names[][4]={

17
lftp-4.0.9-ssl3.patch Normal file
View File

@ -0,0 +1,17 @@
diff -up lftp-4.0.9/src/lftp_ssl.cc.ssl3 lftp-4.0.9/src/lftp_ssl.cc
--- lftp-4.0.9/src/lftp_ssl.cc.ssl3 2009-09-29 07:33:01.000000000 +0200
+++ lftp-4.0.9/src/lftp_ssl.cc 2010-06-30 08:11:52.384019996 +0200
@@ -261,6 +261,13 @@ lftp_ssl_gnutls::lftp_ssl_gnutls(int fd1
gnutls_set_default_priority(session);
gnutls_transport_set_ptr(session,(gnutls_transport_ptr_t)fd);
+
+ const char *auth=ResMgr::Query("ssl-auth", hostname);
+ if(!strncmp(auth, "SSL", 3))
+ {
+ int proto[] = { GNUTLS_SSL3, 0 };
+ gnutls_protocol_set_priority(session, proto);
+ }
}
void lftp_ssl_gnutls::load_keys()
{

8
lftp.spec
View File

@ -1,7 +1,7 @@
Summary: A sophisticated file transfer program
Name: lftp
Version: 4.0.9
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv3+
Group: Applications/Internet
Source0: ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.lzma
@ -10,6 +10,7 @@ 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
Patch2: lftp-4.0.9-ssl3.patch
%description
LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job
@ -30,6 +31,7 @@ Utility scripts for use with lftp.
%setup -q
%patch1 -p1 -b .date_fmt
%patch2 -p1 -b .ssl3
#sed -i.rpath -e '/lftp_cv_openssl/s|-R.*lib||' configure
sed -i.norpath -e \
@ -92,6 +94,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Jun 24 2010 Jiri Skala <jskala@redhat.com> - 4.0.9-3
- fixes issue when some servers require forcing SSL3.0
- corrected check for 'max time' used for fix #600218
* Tue Jun 22 2010 Jiri Skala <jskala@redhat.com> - 4.0.9-2
- fixes #600218 - [abrt] Process /usr/bin/lftp was killed by signal 1