[pkgsrc/trunk]: pkgsrc Address PR pkg/24744 by Jarmo Jaakkola <jarmo.jaakkola...

[hubertf <hubertf%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/71481bfdd217
branches:  trunk
changeset: 490801:71481bfdd217
user:      hubertf <hubertf%pkgsrc.org@localhost>
date:      Sun Mar 20 15:55:54 2005 +0000

description:
Address PR pkg/24744 by Jarmo Jaakkola <jarmo.jaakkola%iki.fi@localhost>:
 * 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:

 doc/CHANGES                              |  3 ++-
 pkgtools/pkg_install/files/lib/ftpio.c   |  8 ++++----
 pkgtools/pkg_install/files/lib/version.h |  4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diffs (67 lines):

diff -r 82fdcdc348e4 -r 71481bfdd217 doc/CHANGES
--- a/doc/CHANGES       Sun Mar 20 15:21:04 2005 +0000
+++ b/doc/CHANGES       Sun Mar 20 15:55:54 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.9521 2005/03/20 14:15:21 ben Exp $
+$NetBSD: CHANGES,v 1.9522 2005/03/20 15:56:41 hubertf Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 
@@ -1422,3 +1422,4 @@
        Updated tunesbrowser to 0.2.0 [jmmv 2005-03-20]
        Updated avr-gcc to 3.3.2003.05.11nb1 [jmmv 2005-03-20]
        Updated fprot-workstation-bin to 4.5.4 [ben 2005-03-20]
+       Updated pkg_install to 20050318 [hubertf 2005-03-20]
diff -r 82fdcdc348e4 -r 71481bfdd217 pkgtools/pkg_install/files/lib/ftpio.c
--- a/pkgtools/pkg_install/files/lib/ftpio.c    Sun Mar 20 15:21:04 2005 +0000
+++ b/pkgtools/pkg_install/files/lib/ftpio.c    Sun Mar 20 15:55:54 2005 +0000
@@ -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 @@
 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 @@
        }
 
        /* 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 -r 82fdcdc348e4 -r 71481bfdd217 pkgtools/pkg_install/files/lib/version.h
--- a/pkgtools/pkg_install/files/lib/version.h  Sun Mar 20 15:21:04 2005 +0000
+++ b/pkgtools/pkg_install/files/lib/version.h  Sun Mar 20 15:55:54 2005 +0000
@@ -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_ */