diff options
| author | hubertf <hubertf@pkgsrc.org> | 2006-04-18 20:41:44 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 2006-04-18 20:41:44 +0000 |
| commit | 8f17059838f68eba5d7134e30201a6eebd7a7bf2 (patch) | |
| tree | a27f9b95722df18c2eec93580d878cac337f7f06 /pkgtools | |
| parent | 77db9854264b9cda0d5d49f5aae740179a6cc5c8 (diff) | |
| download | pkgsrc-8f17059838f68eba5d7134e30201a6eebd7a7bf2.tar.gz | |
Sync with NetBSD's src/usr.sbin/pkg_install Version 20060418,
mostly for the timeout fix in ftpio.c.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_install/files/lib/ftpio.c | 10 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/lib/version.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgtools/pkg_install/files/lib/ftpio.c b/pkgtools/pkg_install/files/lib/ftpio.c index dd347ec1b23..e06bd6d541b 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.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 @@ expect(int fd, const char *str, int *ftprc) 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 @@ unpackURL(const char *url, const char *dir) 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 --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h index 175ab95615e..44ee911c0be 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.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_ */ |