From ab16894e622351dea559201865b4144188becd64 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@fedoraproject.org>
Date: Fri, 10 Aug 2007 11:33:29 +0000
Subject: [PATCH] - fix anonymous ftp login (#251570), thanks to David Cantrell

---
 curl-7.16.4-ftp.patch | 11 +++++++++++
 curl.spec             |  7 ++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 curl-7.16.4-ftp.patch

diff --git a/curl-7.16.4-ftp.patch b/curl-7.16.4-ftp.patch
new file mode 100644
index 0000000..11e5d9a
--- /dev/null
+++ b/curl-7.16.4-ftp.patch
@@ -0,0 +1,11 @@
+--- 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:"");
diff --git a/curl.spec b/curl.spec
index 354cd0a..c5d1bdd 100644
--- a/curl.spec
+++ b/curl.spec
@@ -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 @@ use cURL's capabilities internally.
 %setup -q 
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .privlibs
+%patch3 -p1 -b .ftp
 
 %build
 if pkg-config openssl ; then
@@ -98,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Fri Aug 10 2007 Jindrich Novy <jnovy@redhat.com> 7.16.4-2
+- fix anonymous ftp login (#251570), thanks to David Cantrell
+
 * Wed Jul 11 2007 Jindrich Novy <jnovy@redhat.com> 7.16.4-1
 - update to 7.16.4