From 3a25d7729cc87c2e53c04eb974cdabe1dbb70040 Mon Sep 17 00:00:00 2001
From: Jiri Skala <jskala@fedoraproject.org>
Date: Mar 04 2010 13:59:09 +0000
Subject: - fixes #566562 - lftp doesn't properly implement CCC


---

diff --git a/.cvsignore b/.cvsignore
index 7cfd980..4b83360 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lftp-4.0.5.tar.lzma
+lftp-3.7.14.tar.gz
diff --git a/lftp-3.7.14-decode.patch b/lftp-3.7.14-decode.patch
new file mode 100644
index 0000000..7c89511
--- /dev/null
+++ b/lftp-3.7.14-decode.patch
@@ -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)
diff --git a/lftp-4.0.5-ccc.patch b/lftp-4.0.5-ccc.patch
index 396d490..f19938b 100644
--- a/lftp-4.0.5-ccc.patch
+++ b/lftp-4.0.5-ccc.patch
@@ -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))
        {
diff --git a/lftp.spec b/lftp.spec
index b6bc5e1..2b735ef 100644
--- a/lftp.spec
+++ b/lftp.spec
@@ -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@redhat.com> - 4.0.5-1
-- update to latest upstream
+* Thu Mar 04 2010 Jiri Skala <jskala@redhat.com> - 3.7.14-3
 - fixes #566562 - lftp doesn't properly implement CCC
 
 * Wed Jun 10 2009 Jiri Skala <jskala@redhat.com> - 3.7.14-2
diff --git a/sources b/sources
index df94c5f..c6e1d15 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-07803bc69f5f78538e2534a484af174f  lftp-4.0.5.tar.lzma
+b0cad53f75ebd37b9dc6aeeb8d05f88c  lftp-3.7.14.tar.gz