[src/netbsd-3]: src/usr.sbin/pkg_install/lib Pull up following revision(s) (r...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1b36a720576f
branches:  netbsd-3
changeset: 577450:1b36a720576f
user:      tron <tron%NetBSD.org@localhost>
date:      Sun Nov 06 13:39:10 2005 +0000

description:
Pull up following revision(s) (requested by wiz in ticket #938):
        usr.sbin/pkg_install/lib/version.h: revision 1.69
        usr.sbin/pkg_install/lib/ftpio.c: revision 1.68
Treat FTP error 450 like 550, otherwise pkg_add from a proftpd server
can hang.
Submitted-by: Eirik Nygaard

diffstat:

 usr.sbin/pkg_install/lib/ftpio.c   |  6 +++---
 usr.sbin/pkg_install/lib/version.h |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r 588d4f4677ef -r 1b36a720576f usr.sbin/pkg_install/lib/ftpio.c
--- a/usr.sbin/pkg_install/lib/ftpio.c  Sun Nov 06 13:34:02 2005 +0000
+++ b/usr.sbin/pkg_install/lib/ftpio.c  Sun Nov 06 13:39:10 2005 +0000
@@ -1,8 +1,8 @@
-/*     $NetBSD: ftpio.c,v 1.66.2.1 2005/03/19 13:16:56 tron Exp $      */
+/*     $NetBSD: ftpio.c,v 1.66.2.2 2005/11/06 13:39:10 tron Exp $      */
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ftpio.c,v 1.66.2.1 2005/03/19 13:16:56 tron Exp $");
+__RCSID("$NetBSD: ftpio.c,v 1.66.2.2 2005/11/06 13:39:10 tron Exp $");
 #endif
 
 /*-
@@ -645,7 +645,7 @@
                                (int)(s-pattern), pattern, tmpname);
        }
 
-       rc = ftp_cmd(buf, "\n(550|226).*\n"); /* catch errors */
+       rc = ftp_cmd(buf, "\n(550|450|226).*\n"); /* catch errors */
        if (rc != 226) {
                if (Verbose)
                        warnx("nlist failed!");
diff -r 588d4f4677ef -r 1b36a720576f usr.sbin/pkg_install/lib/version.h
--- a/usr.sbin/pkg_install/lib/version.h        Sun Nov 06 13:34:02 2005 +0000
+++ b/usr.sbin/pkg_install/lib/version.h        Sun Nov 06 13:39:10 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.64.2.4 2005/07/30 17:40:40 tron Exp $    */
+/*     $NetBSD: version.h,v 1.64.2.5 2005/11/06 13:39:10 tron 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 "20050718"
+#define PKGTOOLS_VERSION "20051030"
 
 #endif /* _INST_LIB_VERSION_H_ */