rpms/lftp/devel lftp-4.0.9-ssl3.patch, NONE, 1.1 lftp-4.0.9-date_fmt.patch, 1.1, 1.2 lftp.spec, 1.95, 1.96

[Jiri Skala]

Author: jskala

Update of /cvs/extras/rpms/lftp/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10122

Modified Files:
	lftp-4.0.9-date_fmt.patch lftp.spec 
Added Files:
	lftp-4.0.9-ssl3.patch 
Log Message:
* Thu Jun 24 2010 Jiri Skala <jskala at redhat.com> - 4.0.9-3
- fixes issue when some servers require forcing SSL3.0
- corrected check for 'max time' used for fix #600218


lftp-4.0.9-ssl3.patch:
 lftp_ssl.cc |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE lftp-4.0.9-ssl3.patch ---
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()
 {

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

Index: lftp-4.0.9-date_fmt.patch
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/lftp-4.0.9-date_fmt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lftp-4.0.9-date_fmt.patch	22 Jun 2010 17:35:12 -0000	1.1
+++ lftp-4.0.9-date_fmt.patch	30 Jun 2010 06:19:11 -0000	1.2
@@ -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]={


Index: lftp.spec
===================================================================
RCS file: /cvs/extras/rpms/lftp/devel/lftp.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- lftp.spec	22 Jun 2010 17:35:12 -0000	1.95
+++ lftp.spec	30 Jun 2010 06:19:12 -0000	1.96
@@ -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
 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 at 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 at redhat.com> - 4.0.9-2
 - fixes #600218 - [abrt] Process /usr/bin/lftp was killed by signal 1