[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files/lib Sync with NetBSD's src/...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d137972c3a4d
branches:  trunk
changeset: 511666:d137972c3a4d
user:      hubertf <hubertf%pkgsrc.org@localhost>
date:      Tue Apr 18 20:41:44 2006 +0000

description:
Sync with NetBSD's src/usr.sbin/pkg_install Version 20060418,
mostly for the timeout fix in ftpio.c.

diffstat:

 pkgtools/pkg_install/files/lib/ftpio.c   |  10 +++++-----
 pkgtools/pkg_install/files/lib/version.h |   4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (58 lines):

diff -r 0bdf3b8efee9 -r d137972c3a4d pkgtools/pkg_install/files/lib/ftpio.c
--- a/pkgtools/pkg_install/files/lib/ftpio.c    Tue Apr 18 20:26:05 2006 +0000
+++ b/pkgtools/pkg_install/files/lib/ftpio.c    Tue Apr 18 20:41:44 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ftpio.c,v 1.19 2006/04/05 18:17:31 wiz Exp $   */
+/*     $NetBSD: ftpio.c,v 1.20 2006/04/18 20:41:44 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.19 2006/04/05 18:17:31 wiz Exp $");
+__RCSID("$NetBSD: ftpio.c,v 1.20 2006/04/18 20:41:44 hubertf Exp $");
 #endif
 
 /*-
@@ -217,7 +217,7 @@
        set[0].fd = fd;
        set[0].events = POLLIN;
        while(!done) {
-               rc = poll(set, 1, 10*60*1000);    /* seconds until next message from tar */
+               rc = poll(set, 1, 60*60*1000);    /* seconds until next message from tar */
                switch (rc) {
                case -1:
                        if (errno == EINTR)
@@ -1240,11 +1240,11 @@
                        errx(EXIT_FAILURE, "don't know how to decompress %s, sorry", pkg);
 
                /* yes, this is gross, but needed for borken ftp(1) */
-               (void) snprintf(cmd, sizeof(cmd), "get %s \"| ( cd %s; " TAR_CMD " %s %s -%sxp -f - | tee /dev/stderr )\"\n",
+               (void) snprintf(cmd, sizeof(cmd), "get %s \"| ( cd %s; " TAR_CMD " %s %s -vvxp -f - | tee %s )\"\n",
                    pkg, dir,
                    decompress_cmd != NULL ? "--use-compress-program" : "",
                    decompress_cmd != NULL ? decompress_cmd : "",
-                   Verbose? "vv" : "");
+                   Verbose ? "/dev/stderr" : "/dev/null");
 
                rc = ftp_cmd(cmd, "\n(226|550).*\n");
                if (rc != 226) {
diff -r 0bdf3b8efee9 -r d137972c3a4d pkgtools/pkg_install/files/lib/version.h
--- a/pkgtools/pkg_install/files/lib/version.h  Tue Apr 18 20:26:05 2006 +0000
+++ b/pkgtools/pkg_install/files/lib/version.h  Tue Apr 18 20:41:44 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.57 2006/04/06 06:49:30 reed Exp $        */
+/*     $NetBSD: version.h,v 1.58 2006/04/18 20:41:45 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 "20060405"
+#define PKGTOOLS_VERSION "20060418"
 
 #endif /* _INST_LIB_VERSION_H_ */