- fix anonymous ftp login (#251570), thanks to David Cantrell

This commit is contained in:
Jindrich Novy 2007-08-10 11:33:29 +00:00
parent 35d4a39474
commit ab16894e62
2 changed files with 17 additions and 1 deletions

11
curl-7.16.4-ftp.patch Normal file
View File

@ -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:"");

View File

@ -4,12 +4,13 @@
Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
Name: curl Name: curl
Version: 7.16.4 Version: 7.16.4
Release: 1%{?dist} Release: 2%{?dist}
License: MIT License: MIT
Group: Applications/Internet Group: Applications/Internet
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
Patch1: curl-7.15.3-multilib.patch Patch1: curl-7.15.3-multilib.patch
Patch2: curl-7.16.0-privlibs.patch Patch2: curl-7.16.0-privlibs.patch
Patch3: curl-7.16.4-ftp.patch
URL: http://curl.haxx.se/ URL: http://curl.haxx.se/
Requires: openssl Requires: openssl
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -38,6 +39,7 @@ use cURL's capabilities internally.
%setup -q %setup -q
%patch1 -p1 -b .multilib %patch1 -p1 -b .multilib
%patch2 -p1 -b .privlibs %patch2 -p1 -b .privlibs
%patch3 -p1 -b .ftp
%build %build
if pkg-config openssl ; then if pkg-config openssl ; then
@ -98,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/aclocal/libcurl.m4 %{_datadir}/aclocal/libcurl.m4
%changelog %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 * Wed Jul 11 2007 Jindrich Novy <jnovy@redhat.com> 7.16.4-1
- update to 7.16.4 - update to 7.16.4