[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files Sync with NetBSD base:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/984f413167f2
branches:  trunk
changeset: 527926:984f413167f2
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Apr 16 12:55:34 2007 +0000

description:
Sync with NetBSD base:
Some FTP server don't expand [] in NLIST, most noticable is vsftpd.
Avoid this by splitting the wildcard search pattern into two commands.
Sync some other minor changes.

Bump to 20070416.

diffstat:

 pkgtools/pkg_install/files/add/extract.c     |   6 +++---
 pkgtools/pkg_install/files/add/perform.c     |   5 ++---
 pkgtools/pkg_install/files/bpm/bpm.1         |   2 +-
 pkgtools/pkg_install/files/configure         |  18 +++++++++---------
 pkgtools/pkg_install/files/configure.ac      |   2 +-
 pkgtools/pkg_install/files/create/perform.c  |   6 +++---
 pkgtools/pkg_install/files/info/show.c       |   5 ++---
 pkgtools/pkg_install/files/lib/defs.h        |   2 +-
 pkgtools/pkg_install/files/lib/dewey.h       |   2 +-
 pkgtools/pkg_install/files/lib/file.c        |   6 +++---
 pkgtools/pkg_install/files/lib/ftpio.c       |  27 ++++++++++++++++++++-------
 pkgtools/pkg_install/files/lib/pkg_summary.5 |   2 +-
 pkgtools/pkg_install/files/lib/version.h     |   4 ++--
 13 files changed, 49 insertions(+), 38 deletions(-)

diffs (truncated from 349 to 300 lines):

diff -r 9d9fc4aa46db -r 984f413167f2 pkgtools/pkg_install/files/add/extract.c
--- a/pkgtools/pkg_install/files/add/extract.c  Mon Apr 16 06:51:53 2007 +0000
+++ b/pkgtools/pkg_install/files/add/extract.c  Mon Apr 16 12:55:34 2007 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: extract.c,v 1.14 2006/11/03 09:35:14 joerg Exp $       */
+/*     $NetBSD: extract.c,v 1.15 2007/04/16 12:55:35 joerg Exp $       */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -14,7 +14,7 @@
 #if 0
 static const char *rcsid = "FreeBSD - Id: extract.c,v 1.17 1997/10/08 07:45:35 charnier Exp";
 #else
-__RCSID("$NetBSD: extract.c,v 1.14 2006/11/03 09:35:14 joerg Exp $");
+__RCSID("$NetBSD: extract.c,v 1.15 2007/04/16 12:55:35 joerg Exp $");
 #endif
 #endif
 
@@ -62,7 +62,7 @@
        int                     count;
 
        /* set up arguments to run "pax -r -w -p e" */
-       file_args[0] = strrchr(PAX_CMD, '/');
+       file_args[0] = (char *)strrchr(PAX_CMD, '/');
        if (file_args[0] == NULL)
                file_args[0] = PAX_CMD;
        else
diff -r 9d9fc4aa46db -r 984f413167f2 pkgtools/pkg_install/files/add/perform.c
--- a/pkgtools/pkg_install/files/add/perform.c  Mon Apr 16 06:51:53 2007 +0000
+++ b/pkgtools/pkg_install/files/add/perform.c  Mon Apr 16 12:55:34 2007 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: perform.c,v 1.44 2007/03/11 22:05:03 joerg Exp $       */
+/*     $NetBSD: perform.c,v 1.45 2007/04/16 12:55:35 joerg Exp $       */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -14,7 +14,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.44 2007/03/11 22:05:03 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.45 2007/04/16 12:55:35 joerg Exp $");
 #endif
 #endif
 
@@ -47,7 +47,6 @@
 #if HAVE_ERRNO_H
 #include <errno.h>
 #endif
-#include "defs.h"
 #include "lib.h"
 #include "add.h"
 #include "verify.h"
diff -r 9d9fc4aa46db -r 984f413167f2 pkgtools/pkg_install/files/bpm/bpm.1
--- a/pkgtools/pkg_install/files/bpm/bpm.1      Mon Apr 16 06:51:53 2007 +0000
+++ b/pkgtools/pkg_install/files/bpm/bpm.1      Mon Apr 16 12:55:34 2007 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: bpm.1,v 1.2 2004/03/30 15:28:08 tv Exp $ */
+.\" $NetBSD: bpm.1,v 1.3 2007/04/16 12:55:35 joerg Exp $ */
 .\"
 .\"
 .\" Copyright (c) 2003 Alistair G. Crooks.  All rights reserved.
diff -r 9d9fc4aa46db -r 984f413167f2 pkgtools/pkg_install/files/configure
--- a/pkgtools/pkg_install/files/configure      Mon Apr 16 06:51:53 2007 +0000
+++ b/pkgtools/pkg_install/files/configure      Mon Apr 16 12:55:34 2007 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for pkg_install 20050607.
+# Generated by GNU Autoconf 2.59 for pkg_install 20070416.
 #
 # Report bugs to <grant%NetBSD.org@localhost>.
 #
@@ -269,8 +269,8 @@
 # Identity of this package.
 PACKAGE_NAME='pkg_install'
 PACKAGE_TARNAME='pkg_install'
-PACKAGE_VERSION='20050607'
-PACKAGE_STRING='pkg_install 20050607'
+PACKAGE_VERSION='20070414'
+PACKAGE_STRING='pkg_install 20070416'
 PACKAGE_BUGREPORT='grant%NetBSD.org@localhost'
 
 ac_unique_file="lib/plist.c"
@@ -780,7 +780,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures pkg_install 20050607 to adapt to many kinds of systems.
+\`configure' configures pkg_install 20070416 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -841,7 +841,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pkg_install 20050607:";;
+     short | recursive ) echo "Configuration of pkg_install 20070416:";;
    esac
   cat <<\_ACEOF
 
@@ -962,7 +962,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-pkg_install configure 20050607
+pkg_install configure 20070416
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -976,7 +976,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by pkg_install $as_me 20050607, which was
+It was created by pkg_install $as_me 20070416, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -6368,7 +6368,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by pkg_install $as_me 20050607, which was
+This file was extended by pkg_install $as_me 20070416, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6428,7 +6428,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-pkg_install config.status 20050607
+pkg_install config.status 20070416
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff -r 9d9fc4aa46db -r 984f413167f2 pkgtools/pkg_install/files/configure.ac
--- a/pkgtools/pkg_install/files/configure.ac   Mon Apr 16 06:51:53 2007 +0000
+++ b/pkgtools/pkg_install/files/configure.ac   Mon Apr 16 12:55:34 2007 +0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
-AC_INIT([pkg_install], [20050607], [grant%NetBSD.org@localhost])
+AC_INIT([pkg_install], [20070416], [grant%NetBSD.org@localhost])
 AC_CONFIG_SRCDIR([lib/plist.c])
 AC_CONFIG_HEADER(lib/config.h)
 
diff -r 9d9fc4aa46db -r 984f413167f2 pkgtools/pkg_install/files/create/perform.c
--- a/pkgtools/pkg_install/files/create/perform.c       Mon Apr 16 06:51:53 2007 +0000
+++ b/pkgtools/pkg_install/files/create/perform.c       Mon Apr 16 12:55:34 2007 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: perform.c,v 1.11 2007/03/11 22:05:03 joerg Exp $       */
+/*     $NetBSD: perform.c,v 1.12 2007/04/16 12:55:35 joerg Exp $       */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.38 1997/10/13 15:03:51 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.11 2007/03/11 22:05:03 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.12 2007/04/16 12:55:35 joerg Exp $");
 #endif
 #endif
 
@@ -65,7 +65,7 @@
        FILE   *totar;
        pipe_to_system_t        *to_pipe;
 
-       if ((args[0] = strrchr(TAR_CMD, '/')) == NULL)
+       if ((args[0] = (char *)strrchr(TAR_CMD, '/')) == NULL)
                args[0] = TAR_CMD;
        else
                args[0]++;
diff -r 9d9fc4aa46db -r 984f413167f2 pkgtools/pkg_install/files/info/show.c
--- a/pkgtools/pkg_install/files/info/show.c    Mon Apr 16 06:51:53 2007 +0000
+++ b/pkgtools/pkg_install/files/info/show.c    Mon Apr 16 12:55:34 2007 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: show.c,v 1.11 2006/05/10 04:25:30 jlam Exp $   */
+/*     $NetBSD: show.c,v 1.12 2007/04/16 12:55:35 joerg Exp $  */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: show.c,v 1.11 1997/10/08 07:47:38 charnier Exp";
 #else
-__RCSID("$NetBSD: show.c,v 1.11 2006/05/10 04:25:30 jlam Exp $");
+__RCSID("$NetBSD: show.c,v 1.12 2007/04/16 12:55:35 joerg Exp $");
 #endif
 #endif
 
@@ -68,7 +68,6 @@
 #include <err.h>
 #endif
 
-#include "defs.h"
 #include "lib.h"
 #include "info.h"
 
diff -r 9d9fc4aa46db -r 984f413167f2 pkgtools/pkg_install/files/lib/defs.h
--- a/pkgtools/pkg_install/files/lib/defs.h     Mon Apr 16 06:51:53 2007 +0000
+++ b/pkgtools/pkg_install/files/lib/defs.h     Mon Apr 16 12:55:34 2007 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.5 2006/04/24 13:52:05 dillo Exp $ */
+/* $NetBSD: defs.h,v 1.6 2007/04/16 12:55:35 joerg Exp $ */
 
 /*
  * Copyright (c) 1999-2000 Alistair G. Crooks.  All rights reserved.
diff -r 9d9fc4aa46db -r 984f413167f2 pkgtools/pkg_install/files/lib/dewey.h
--- a/pkgtools/pkg_install/files/lib/dewey.h    Mon Apr 16 06:51:53 2007 +0000
+++ b/pkgtools/pkg_install/files/lib/dewey.h    Mon Apr 16 12:55:34 2007 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dewey.h,v 1.1 2005/11/05 13:20:09 wiz Exp $ */
+/* $NetBSD: dewey.h,v 1.2 2007/04/16 12:55:35 joerg Exp $ */
 
 #ifndef _INST_LIB_DEWEY_H_
 #define _INST_LIB_DEWEY_H_
diff -r 9d9fc4aa46db -r 984f413167f2 pkgtools/pkg_install/files/lib/file.c
--- a/pkgtools/pkg_install/files/lib/file.c     Mon Apr 16 06:51:53 2007 +0000
+++ b/pkgtools/pkg_install/files/lib/file.c     Mon Apr 16 12:55:34 2007 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: file.c,v 1.18 2006/04/04 06:31:22 wiz Exp $    */
+/*     $NetBSD: file.c,v 1.19 2007/04/16 12:55:35 joerg Exp $  */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -17,7 +17,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: file.c,v 1.29 1997/10/08 07:47:54 charnier Exp";
 #else
-__RCSID("$NetBSD: file.c,v 1.18 2006/04/04 06:31:22 wiz Exp $");
+__RCSID("$NetBSD: file.c,v 1.19 2007/04/16 12:55:35 joerg Exp $");
 #endif
 #endif
 
@@ -651,7 +651,7 @@
        } else
                decompress_cmd = GZIP_CMD;
 
-       up_argv[i] = strrchr(TAR_CMD, '/');
+       up_argv[i] = (char *)strrchr(TAR_CMD, '/');
        if (up_argv[i] == NULL)
                up_argv[i] = TAR_CMD;
        else
diff -r 9d9fc4aa46db -r 984f413167f2 pkgtools/pkg_install/files/lib/ftpio.c
--- a/pkgtools/pkg_install/files/lib/ftpio.c    Mon Apr 16 06:51:53 2007 +0000
+++ b/pkgtools/pkg_install/files/lib/ftpio.c    Mon Apr 16 12:55:34 2007 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ftpio.c,v 1.20 2006/04/18 20:41:44 hubertf Exp $       */
+/*     $NetBSD: ftpio.c,v 1.21 2007/04/16 12:55:35 joerg 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.20 2006/04/18 20:41:44 hubertf Exp $");
+__RCSID("$NetBSD: ftpio.c,v 1.21 2007/04/16 12:55:35 joerg Exp $");
 #endif
 
 /*-
@@ -347,7 +347,7 @@
        int answer_pipe[2];
        int rc1, rc2;
        char buf[20];
-       char *argv0 = strrchr(FTP_CMD, '/');
+       char *argv0 = (char *)strrchr(FTP_CMD, '/');
        if (argv0 == NULL)
                argv0 = FTP_CMD;
        else
@@ -655,7 +655,10 @@
        char *s, buf[MaxPathSize];
        char tmpname[MaxPathSize];
        char best[MaxPathSize];
-       int rc, tfd;
+       int rc, tfd, retry_tbz;
+
+       retry_tbz = 0;
+       best[0]='\0';
 
        rc = ftp_start(base);
        if (rc == -1) {
@@ -684,8 +687,16 @@
                 * we can't use the pkg wildcards here as dewey compare
                 * and alternates won't be handled by ftp(1); sort
                 * out later, using pmatch() */
-               (void) snprintf(buf,  sizeof(buf), "nlist %.*s*.t[bg]z %s\n",
-                               (int)(s-pattern), pattern, tmpname);
+               if (retry_tbz) {
+retry_with_tbz:
+                       (void) snprintf(buf,  sizeof(buf), "nlist %.*s*.tbz %s\n",
+                                       (int)(s-pattern), pattern, tmpname);
+                       retry_tbz = 0;
+               } else {
+                       (void) snprintf(buf,  sizeof(buf), "nlist %.*s*.tgz %s\n",
+                                       (int)(s-pattern), pattern, tmpname);