OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Jul-2007 09:24:18
Branch: HEAD Handle: 2007072008241800
Added files:
openpkg-src/curl curl.patch
Modified files:
openpkg-src/curl curl.spec
Log:
unbreak FTP login on sites who do not require a PASS command at all
(and even choke if one is sent without request). This allows cURL
7.16.4 to again download from ftp.gnu.org. cURL 7.16.3 BTW was still
ok, the bug was introduced in 7.16.3. Upstream vendor will be
notified, too
Summary:
Revision Changes Path
1.11 +13 -0 openpkg-src/curl/curl.patch
1.95 +3 -1 openpkg-src/curl/curl.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/curl/curl.patch
============================================================================
$ cvs diff -u -r0 -r1.11 curl.patch
--- /dev/null 2007-07-20 09:22:00 +0200
+++ curl.patch 2007-07-20 09:24:18 +0200
@@ -0,0 +1,13 @@
+Index: lib/ftp.c
+--- lib/ftp.c.orig 2007-07-02 00:01:19 +0200
++++ lib/ftp.c 2007-07-20 09:20:11 +0200
+@@ -2371,8 +2371,7 @@
+ struct ftp_conn *ftpc = &conn->proto.ftpc;
+ (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:"");
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/curl/curl.spec
============================================================================
$ cvs diff -u -r1.94 -r1.95 curl.spec
--- openpkg-src/curl/curl.spec 11 Jul 2007 05:36:46 -0000 1.94
+++ openpkg-src/curl/curl.spec 20 Jul 2007 07:24:18 -0000 1.95
@@ -33,7 +33,7 @@
Group: Web
License: MIT-style
Version: 7.16.4
-Release: 20070711
+Release: 20070720
# package options
%option with_ssl yes
@@ -44,6 +44,7 @@
# list of sources
Source0: http://curl.haxx.se/download/curl-%{version}.tar.bz2
+Patch0: curl.patch
# build information
Prefix: %{l_prefix}
@@ -89,6 +90,7 @@
%prep
%setup -q
+ %patch -p0
%build
%{l_shtool} subst \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
