rpms/curl/devel curl-7.16.4-ftp.patch,NONE,1.1 curl.spec,1.53,1.54

[Jindrich Novy (jnovy)]

Author: jnovy

Update of /cvs/extras/rpms/curl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4752

Modified Files:
	curl.spec 
Added Files:
	curl-7.16.4-ftp.patch 
Log Message:
- fix anonymous ftp login (#251570), thanks to David Cantrell


curl-7.16.4-ftp.patch:

--- NEW FILE curl-7.16.4-ftp.patch ---
--- curl-7.16.4/lib/ftp.c.ftp	2007-07-02 00:01:19.000000000 +0200
+++ curl-7.16.4/lib/ftp.c	2007-08-10 13:24:34.000000000 +0200
@@ -2372,7 +2372,7 @@ static CURLcode ftp_state_user_resp(stru
   (void)instate; /* no use for this yet */
 
   /* some need password anyway, and others just return 2xx ignored */
-  if((ftpcode == 331 || ftpcode/100 == 2) && (ftpc->state == FTP_USER)) {
+  if((ftpcode == 331) && (ftpc->state == FTP_USER)) {
     /* 331 Password required for ...
        (the server requires to send the user's password too) */
     NBFTPSENDF(conn, "PASS %s", ftp->passwd?ftp->passwd:"");


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- curl.spec	11 Jul 2007 07:47:08 -0000	1.53
+++ curl.spec	10 Aug 2007 11:33:29 -0000	1.54
@@ -4,12 +4,13 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl 
 Version: 7.16.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
 Patch1: curl-7.15.3-multilib.patch
 Patch2: curl-7.16.0-privlibs.patch
+Patch3: curl-7.16.4-ftp.patch
 URL: http://curl.haxx.se/
 Requires: openssl
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,6 +39,7 @@
 %setup -q 
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .privlibs
+%patch3 -p1 -b .ftp
 
 %build
 if pkg-config openssl ; then
@@ -98,6 +100,9 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Fri Aug 10 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-2
+- fix anonymous ftp login (#251570), thanks to David Cantrell
+
 * Wed Jul 11 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-1
 - update to 7.16.4