rpms/lftp/F-11 lftp-3.7.14-decode.patch, 1.2, 1.3 .cvsignore, 1.40, 1.41 lftp-4.0.5-ccc.patch, 1.1, 1.2 lftp.spec, 1.82, 1.83 sources, 1.40, 1.41

[Jiri Skala]

Author: jskala

Update of /cvs/extras/rpms/lftp/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7803

Modified Files:
	.cvsignore lftp-4.0.5-ccc.patch lftp.spec sources 
Added Files:
	lftp-3.7.14-decode.patch 
Log Message:
* Thu Mar 04 2010 Jiri Skala <jskala at redhat.com> - 3.7.14-3
- fixes #566562 - lftp doesn't properly implement CCC


lftp-3.7.14-decode.patch:
 url.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: lftp-3.7.14-decode.patch
===================================================================
RCS file: lftp-3.7.14-decode.patch
diff -N lftp-3.7.14-decode.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lftp-3.7.14-decode.patch	4 Mar 2010 13:59:09 -0000	1.3
@@ -0,0 +1,12 @@
+diff -up lftp-3.7.14/src/url.cc.decode lftp-3.7.14/src/url.cc
+--- lftp-3.7.14/src/url.cc.decode	2009-03-20 12:20:14.000000000 +0100
++++ lftp-3.7.14/src/url.cc	2009-06-10 15:36:30.000000000 +0200
+@@ -366,7 +366,7 @@ int url::decode_string(char *str)
+       *o++=*p++;
+    }
+    *o=0;
+-   return p-str;
++   return o-str;
+ }
+ 
+ const char *url::decode(const char *p)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lftp/F-11/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	4 Mar 2010 13:38:10 -0000	1.40
+++ .cvsignore	4 Mar 2010 13:59:09 -0000	1.41
@@ -1 +1 @@
-lftp-4.0.5.tar.lzma
+lftp-3.7.14.tar.gz

lftp-4.0.5-ccc.patch:
 ftpclass.cc |    1 +
 1 file changed, 1 insertion(+)

Index: lftp-4.0.5-ccc.patch
===================================================================
RCS file: /cvs/extras/rpms/lftp/F-11/lftp-4.0.5-ccc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lftp-4.0.5-ccc.patch	4 Mar 2010 13:38:10 -0000	1.1
+++ lftp-4.0.5-ccc.patch	4 Mar 2010 13:59:09 -0000	1.2
@@ -1,7 +1,7 @@
 diff -up lftp-4.0.5/src/ftpclass.cc.ccc lftp-4.0.5/src/ftpclass.cc
 --- lftp-4.0.5/src/ftpclass.cc.ccc	2010-03-04 14:15:05.633239152 +0100
 +++ lftp-4.0.5/src/ftpclass.cc	2010-03-04 14:15:56.237488489 +0100
-@@ -4136,6 +4136,7 @@ void Ftp::CheckResp(int act)
+@@ -4177,6 +4177,7 @@ void Ftp::CheckResp(int act)
     case Expect::CCC:
        if(is2XX(act))
        {


Index: lftp.spec
===================================================================
RCS file: /cvs/extras/rpms/lftp/F-11/lftp.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- lftp.spec	4 Mar 2010 13:44:34 -0000	1.82
+++ lftp.spec	4 Mar 2010 13:59:09 -0000	1.83
@@ -1,15 +1,16 @@
 Summary:	A sophisticated file transfer program
 Name:		lftp
-Version:	4.0.5
-Release:	1%{?dist}
+Version:	3.7.14
+Release:	3%{?dist}
 License:	GPLv3+
 Group:		Applications/Internet
-Source0:	ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.lzma
+Source0:	ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.gz
 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.5-ccc.patch
+Patch1:  lftp-3.7.14-decode.patch
+Patch2:  lftp-4.0.5-ccc.patch
 
 %description
 LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job
@@ -20,7 +21,8 @@ reliability in mind.
 %prep
 %setup -q
 
-%patch1 -p1 -b .ccc
+%patch1 -p1 -b .decode
+%patch2 -p1 -b .ccc
 
 #sed -i.rpath -e '/lftp_cv_openssl/s|-R.*lib||' configure
 sed -i.norpath -e \
@@ -79,8 +81,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/liblftp-tasks.so.*
 
 %changelog
-* Thu Mar 04 2010 Jiri Skala <jskala at redhat.com> - 4.0.5-1
-- update to latest upstream
+* Thu Mar 04 2010 Jiri Skala <jskala at redhat.com> - 3.7.14-3
 - fixes #566562 - lftp doesn't properly implement CCC
 
 * Wed Jun 10 2009 Jiri Skala <jskala at redhat.com> - 3.7.14-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lftp/F-11/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	4 Mar 2010 13:38:10 -0000	1.40
+++ sources	4 Mar 2010 13:59:09 -0000	1.41
@@ -1 +1 @@
-07803bc69f5f78538e2534a484af174f  lftp-4.0.5.tar.lzma
+b0cad53f75ebd37b9dc6aeeb8d05f88c  lftp-3.7.14.tar.gz