[pkgsrc/trunk]: pkgsrc/net/tnftp/files Merge 20050514

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d5517ce2affb
branches:  trunk
changeset: 493759:d5517ce2affb
user:      lukem <lukem%pkgsrc.org@localhost>
date:      Sat May 14 05:13:09 2005 +0000

description:
Merge 20050514

diffstat:

 net/tnftp/files/ChangeLog     |   19 +-
 net/tnftp/files/config.h.in   |    8 +-
 net/tnftp/files/configure     |  675 +++++++++++++++++------------------------
 net/tnftp/files/configure.in  |   70 ++--
 net/tnftp/files/src/ftp.c     |   16 +-
 net/tnftp/files/src/main.c    |   18 +-
 net/tnftp/files/src/util.c    |   10 +-
 net/tnftp/files/src/version.h |    5 +-
 net/tnftp/files/tnftp.h       |    4 +-
 9 files changed, 361 insertions(+), 464 deletions(-)

diffs (truncated from 2253 to 300 lines):

diff -r b0580c53b5d3 -r d5517ce2affb net/tnftp/files/ChangeLog
--- a/net/tnftp/files/ChangeLog Sat May 14 04:26:15 2005 +0000
+++ b/net/tnftp/files/ChangeLog Sat May 14 05:13:09 2005 +0000
@@ -1,4 +1,19 @@
-NetBSD: ChangeLog,v 1.16 2005/05/11 04:21:53 lukem Exp
+NetBSD: ChangeLog,v 1.17 2005/05/14 04:46:26 lukem Exp
+
+Sat May 14 04:44:35 UTC 2005   lukem
+
+       * Release "tnftp 20050514"
+
+       * Fail if we can't find a library with tgetent (needed for libedit).
+         NetBSD PR pkg/28925.
+       * Improve quoting when using various autoconf macros.
+
+       * Merge NetBSD-ftp 20050513:
+               - Correct the "optlen" argument passed to getsockopt(3) and
+                 setsockopt(3) in various places.  Fixes a problem noted by
+                 Allen Briggs.
+               - Improve warning printed when connect(2) for the data
+                 channel fails.
 
 Wed May 11 04:19:43 UTC 2005   lukem
 
@@ -42,7 +57,7 @@
                  This may (indirectly) fix various problems with timeouts in
                  active mode through broken firewalls.
                - Implement xpoll() as a wrapper around poll(2), to make it
-                 easier to replace on systems without a functional poll(2). 
+                 easier to replace on systems without a functional poll(2).
                  Unconditionally use xpoll() instead of conditionally using
                  select(2) or poll(2).
                - In fetch_url(), don't call freeaddrinfo(res0) too early, as
diff -r b0580c53b5d3 -r d5517ce2affb net/tnftp/files/config.h.in
--- a/net/tnftp/files/config.h.in       Sat May 14 04:26:15 2005 +0000
+++ b/net/tnftp/files/config.h.in       Sat May 14 05:13:09 2005 +0000
@@ -1,5 +1,5 @@
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
-/*     NetBSD: config.h.in,v 1.8 2005/05/11 03:10:26 lukem Exp */
+/*     NetBSD: config.h.in,v 1.9 2005/05/14 04:41:27 lukem Exp */
 
 
 /* Define if on AIX 3.
@@ -183,12 +183,6 @@
 /* Define if you have the socket library (-lsocket).  */
 #undef HAVE_LIBSOCKET
 
-/* Define if you have the tinfo library (-ltinfo).  */
-#undef HAVE_LIBTINFO
-
-/* Define if you have the util library (-lutil).  */
-#undef HAVE_LIBUTIL
-
 /* Define if your compiler supports `long long' */
 #undef HAVE_LONG_LONG
 
diff -r b0580c53b5d3 -r d5517ce2affb net/tnftp/files/configure
--- a/net/tnftp/files/configure Sat May 14 04:26:15 2005 +0000
+++ b/net/tnftp/files/configure Sat May 14 05:13:09 2005 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.12 
+# From configure.in Revision: 1.13 
 
 
 
@@ -1121,14 +1121,14 @@
 
 
 
-echo $ac_n "checking for fparseln in -lutil""... $ac_c" 1>&6
-echo "configure:1126: checking for fparseln in -lutil" >&5
-ac_lib_var=`echo util'_'fparseln | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+
+echo $ac_n "checking for library containing fparseln""... $ac_c" 1>&6
+echo "configure:1127: checking for library containing fparseln" >&5
+if eval "test \"`echo '$''{'ac_cv_search_fparseln'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-lutil  $LIBS"
+  ac_func_search_save_LIBS="$LIBS"
+ac_cv_search_fparseln="no"
 cat > conftest.$ac_ext <<EOF
 #line 1134 "configure"
 #include "confdefs.h"
@@ -1143,87 +1143,57 @@
 EOF
 if { (eval echo configure:1145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  ac_cv_search_fparseln="none required"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo util | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lutil $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test $opt_editcomplete = yes; then
-       echo $ac_n "checking for tgetent in -ltinfo""... $ac_c" 1>&6
-echo "configure:1174: checking for tgetent in -ltinfo" >&5
-ac_lib_var=`echo tinfo'_'tgetent | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ltinfo  $LIBS"
+test "$ac_cv_search_fparseln" = "no" && for i in util; do
+LIBS="-l$i  $ac_func_search_save_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1182 "configure"
+#line 1156 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char tgetent();
+char fparseln();
 
 int main() {
-tgetent()
+fparseln()
 ; return 0; }
 EOF
-if { (eval echo configure:1193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  ac_cv_search_fparseln="-l$i"
+break
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
+done
+LIBS="$ac_func_search_save_LIBS"
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo tinfo | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-ltinfo $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:1219: checking for tgetent in -ltermcap" >&5
-ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+
+echo "$ac_t""$ac_cv_search_fparseln" 1>&6
+if test "$ac_cv_search_fparseln" != "no"; then
+  test "$ac_cv_search_fparseln" = "none required" || LIBS="$ac_cv_search_fparseln $LIBS"
+  have_fparseln=yes
+else :
+  have_fparseln=no
+fi
+if test $opt_editcomplete = yes; then
+       
+echo $ac_n "checking for library containing tgetent""... $ac_c" 1>&6
+echo "configure:1190: checking for library containing tgetent" >&5
+if eval "test \"`echo '$''{'ac_cv_search_tgetent'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-ltermcap  $LIBS"
+  ac_func_search_save_LIBS="$LIBS"
+ac_cv_search_tgetent="no"
 cat > conftest.$ac_ext <<EOF
-#line 1227 "configure"
+#line 1197 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1234,41 +1204,18 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:1238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  ac_cv_search_tgetent="none required"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo termcap | sed -e 's/^a-zA-Z0-9_/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-ltermcap $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:1264: checking for tgetent in -lcurses" >&5
-ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lcurses  $LIBS"
+test "$ac_cv_search_tgetent" = "no" && for i in termcap termlib curses ncurses tinfo; do
+LIBS="-l$i  $ac_func_search_save_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1272 "configure"
+#line 1219 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1279,94 +1226,36 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:1283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  ac_cv_search_tgetent="-l$i"
+break
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
+done
+LIBS="$ac_func_search_save_LIBS"
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo curses | sed -e 's/^a-zA-Z0-9_/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lcurses $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:1309: checking for tgetent in -lncurses" >&5
-ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lncurses  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1317 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char tgetent();
-