diff options
| author | hubertf <hubertf@pkgsrc.org> | 2005-03-20 15:55:54 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 2005-03-20 15:55:54 +0000 |
| commit | da4b4c92b9a1de1ee08fbe15daa23596717d61be (patch) | |
| tree | dc9b3b44eaaef81d9456595e2ed41e3d8ae40efe /pkgtools | |
| parent | 7511dc8287a1f767f195ff9573dc01d50c46f64f (diff) | |
| download | pkgsrc-da4b4c92b9a1de1ee08fbe15daa23596717d61be.tar.gz | |
Address PR pkg/24744 by Jarmo Jaakkola <jarmo.jaakkola@iki.fi>:
* ftp.fi.netbsd.org returns "257" in return to a "cd" command, accept that
(in addition to 250 and 550). Seems to be allowed per RFC 959.
* Make buffer for reply bigger (not too big, as it may hit performance).
* Bump PKGTOOLS_VERSION (NOT!!! PKGTOOLS_REQD) to 20050318
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_install/files/lib/ftpio.c | 8 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/lib/version.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgtools/pkg_install/files/lib/ftpio.c b/pkgtools/pkg_install/files/lib/ftpio.c index 982ddee6ae9..33e98c59c41 100644 --- a/pkgtools/pkg_install/files/lib/ftpio.c +++ b/pkgtools/pkg_install/files/lib/ftpio.c @@ -1,4 +1,4 @@ -/* $NetBSD: ftpio.c,v 1.14 2005/01/07 11:58:12 agc Exp $ */ +/* $NetBSD: ftpio.c,v 1.15 2005/03/20 15:55:54 hubertf Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -8,7 +8,7 @@ #include <sys/cdefs.h> #endif #ifndef lint -__RCSID("$NetBSD: ftpio.c,v 1.14 2005/01/07 11:58:12 agc Exp $"); +__RCSID("$NetBSD: ftpio.c,v 1.15 2005/03/20 15:55:54 hubertf Exp $"); #endif /*- @@ -182,7 +182,7 @@ static int expect(int fd, const char *str, int *ftprc) { int rc; - char buf[90]; + char buf[256]; #if EXPECT_DEBUG char *vstr; #endif /* EXPECT_DEBUG */ @@ -697,7 +697,7 @@ ftp_expand_URL(const char *base, char *pattern) } /* Sync - don't remove */ - rc = ftp_cmd("cd .\n", "\n(550|250).*\n"); + rc = ftp_cmd("cd .\n", "\n(550|250|257).*\n"); if (rc != 250) { warnx("chdir failed!"); unlink(tmpname); /* remove clutter */ diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h index 8be5702f0ea..c2e747f2fc4 100644 --- a/pkgtools/pkg_install/files/lib/version.h +++ b/pkgtools/pkg_install/files/lib/version.h @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.41 2005/02/10 23:51:18 grant Exp $ */ +/* $NetBSD: version.h,v 1.42 2005/03/20 15:55:54 hubertf Exp $ */ /* * Copyright (c) 2001 Thomas Klausner. All rights reserved. @@ -33,6 +33,6 @@ #ifndef _INST_LIB_VERSION_H_ #define _INST_LIB_VERSION_H_ -#define PKGTOOLS_VERSION "20050210" +#define PKGTOOLS_VERSION "20050318" #endif /* _INST_LIB_VERSION_H_ */ |