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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/024a7ee93ed7
branches:  trunk
changeset: 496304:024a7ee93ed7
user:      lukem <lukem%pkgsrc.org@localhost>
date:      Sat Jun 25 07:00:41 2005 +0000

description:
Merge tnftp 20050625

diffstat:

 net/tnftp/files/ChangeLog    |   32 ++-
 net/tnftp/files/acconfig.h   |   30 +-
 net/tnftp/files/aclocal.m4   |    4 +-
 net/tnftp/files/config.h.in  |   33 +-
 net/tnftp/files/configure    |  656 ++++++++++++++----------------------------
 net/tnftp/files/configure.in |   36 +-
 net/tnftp/files/tnftp.h      |   13 +-
 7 files changed, 324 insertions(+), 480 deletions(-)

diffs (truncated from 2138 to 300 lines):

diff -r 717c60212a91 -r 024a7ee93ed7 net/tnftp/files/ChangeLog
--- a/net/tnftp/files/ChangeLog Sat Jun 25 04:41:14 2005 +0000
+++ b/net/tnftp/files/ChangeLog Sat Jun 25 07:00:41 2005 +0000
@@ -1,4 +1,34 @@
-NetBSD: ChangeLog,v 1.27 2005/06/10 04:40:13 lukem Exp
+NetBSD: ChangeLog,v 1.30 2005/06/25 06:27:32 lukem Exp
+
+Sat Jun 25 06:27:00 UTC 2005   lukem
+
+       * Release as "tnftp 20050625"
+
+       * Simplify the detection & replacement of dirname() and fparseln()
+         and just use AC_REPLACE_FUNCS.
+         (We don't care if the vendor has a working version in -lgen or -lutil
+         instead of -lc; they'll get our replacement version in that case).
+         Fixes build issue on older Darwin where the previous autoconf check
+         wouldn't find dirname() in the default system libraries.
+
+       * Only provide a prototype for dirname() if we can't find one in
+         <libgen.h>
+
+       * Search for NS_IN6ADDRSZ instead of IN6ADDRSZ, since we use the
+         former and not the latter and older Darwin has the former.
+         (This allows INET6 support to be enabled on Darwin 7.9.0)
+
+Mon Jun 13 09:22:13 UTC 2005   lukem
+
+       * Tweak SOCKS5 support:
+           acconfig.h:
+               - fix a comment
+               - ensure close() is replaced
+               - list entries in the same order as aclocal.m4
+                 (and the SOCKS5 FAQ)
+           aclocal.m4:
+               - ensure getpeername() is replaced
+               - don't replace listen() twice
 
 Fri Jun 10 04:39:33 UTC 2005   lukem
 
diff -r 717c60212a91 -r 024a7ee93ed7 net/tnftp/files/acconfig.h
--- a/net/tnftp/files/acconfig.h        Sat Jun 25 04:41:14 2005 +0000
+++ b/net/tnftp/files/acconfig.h        Sat Jun 25 07:00:41 2005 +0000
@@ -1,4 +1,4 @@
-/*     NetBSD: acconfig.h,v 1.6 2005/05/11 03:10:05 lukem Exp  */
+/*     NetBSD: acconfig.h,v 1.8 2005/06/25 06:14:08 lukem Exp  */
 
 @TOP@
 @BOTTOM@
@@ -30,8 +30,8 @@
 /* Define if `struct addrinfo' exists in <netdb.h> */
 #undef HAVE_ADDRINFO
 
-/* Define if IN6ADDRSZ exists in <arpa/nameser.h> */
-#undef HAVE_IN6ADDRSZ
+/* Define if NS_IN6ADDRSZ exists in <arpa/nameser.h> */
+#undef HAVE_NS_IN6ADDRSZ
 
 /*
  * Define if <netdb.h> contains AI_NUMERICHOST et al.
@@ -45,6 +45,9 @@
 /* Define if h_errno exists in <netdb.h> */
 #undef HAVE_H_ERRNO_D
 
+/* Define if dirname() is declared in <libgen.h> */
+#undef HAVE_DIRNAME_D
+
 /* Define if fclose() is declared in <stdio.h> */
 #undef HAVE_FCLOSE_D
 
@@ -75,27 +78,28 @@
 /*
  * Define this if compiling with SOCKS (the firewall traversal library).
  * Also, you must define connect, getsockname, bind, accept, listen, and
- * select to their R-versions.
+ * select to their SOCKS-versions.
  */
 #undef SOCKS
 #undef SOCKS4
 #undef SOCKS5
 #undef connect
 #undef getsockname
+#undef getpeername
 #undef bind
 #undef accept
 #undef listen
 #undef select
+#undef recvfrom
+#undef sendto
+#undef recv
+#undef send
+#undef read
+#undef write
+#undef rresvport
+#undef shutdown
+#undef close
 #undef dup
 #undef dup2
 #undef fclose
 #undef gethostbyname
-#undef getpeername
-#undef read
-#undef recv
-#undef recvfrom
-#undef rresvport
-#undef send
-#undef sendto
-#undef shutdown
-#undef write
diff -r 717c60212a91 -r 024a7ee93ed7 net/tnftp/files/aclocal.m4
--- a/net/tnftp/files/aclocal.m4        Sat Jun 25 04:41:14 2005 +0000
+++ b/net/tnftp/files/aclocal.m4        Sat Jun 25 07:00:41 2005 +0000
@@ -1,4 +1,4 @@
-dnl    NetBSD: aclocal.m4,v 1.3 2005/05/11 03:03:42 lukem Exp
+dnl    NetBSD: aclocal.m4,v 1.4 2005/06/13 09:20:21 lukem Exp
 dnl
 
 dnl
@@ -223,6 +223,7 @@
        AC_DEFINE(SOCKS4)
        AC_DEFINE(connect, Rconnect)
        AC_DEFINE(getsockname, Rgetsockname)
+       AC_DEFINE(getpeername, Rgetpeername)
        AC_DEFINE(bind, Rbind)
        AC_DEFINE(accept, Raccept)
        AC_DEFINE(listen, Rlisten)
@@ -247,7 +248,6 @@
        AC_DEFINE(write,SOCKSwrite)
        AC_DEFINE(rresvport,SOCKSrresvport)
        AC_DEFINE(shutdown,SOCKSshutdown)
-       AC_DEFINE(listen,SOCKSlisten)
        AC_DEFINE(close,SOCKSclose)
        AC_DEFINE(dup,SOCKSdup)
        AC_DEFINE(dup2,SOCKSdup2)
diff -r 717c60212a91 -r 024a7ee93ed7 net/tnftp/files/config.h.in
--- a/net/tnftp/files/config.h.in       Sat Jun 25 04:41:14 2005 +0000
+++ b/net/tnftp/files/config.h.in       Sat Jun 25 07:00:41 2005 +0000
@@ -1,5 +1,5 @@
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
-/*     NetBSD: config.h.in,v 1.10 2005/06/01 15:10:21 lukem Exp        */
+/*     NetBSD: config.h.in,v 1.12 2005/06/25 06:14:57 lukem Exp        */
 
 
 /* Define if on AIX 3.
@@ -144,6 +144,9 @@
 /* Define if you have the <err.h> header file.  */
 #undef HAVE_ERR_H
 
+/* Define if you have the <libgen.h> header file.  */
+#undef HAVE_LIBGEN_H
+
 /* Define if you have the <libutil.h> header file.  */
 #undef HAVE_LIBUTIL_H
 
@@ -213,8 +216,8 @@
 /* Define if `struct addrinfo' exists in <netdb.h> */
 #undef HAVE_ADDRINFO
 
-/* Define if IN6ADDRSZ exists in <arpa/nameser.h> */
-#undef HAVE_IN6ADDRSZ
+/* Define if NS_IN6ADDRSZ exists in <arpa/nameser.h> */
+#undef HAVE_NS_IN6ADDRSZ
 
 /*
  * Define if <netdb.h> contains AI_NUMERICHOST et al.
@@ -228,6 +231,9 @@
 /* Define if h_errno exists in <netdb.h> */
 #undef HAVE_H_ERRNO_D
 
+/* Define if dirname() is declared in <libgen.h> */
+#undef HAVE_DIRNAME_D
+
 /* Define if fclose() is declared in <stdio.h> */
 #undef HAVE_FCLOSE_D
 
@@ -258,27 +264,28 @@
 /*
  * Define this if compiling with SOCKS (the firewall traversal library).
  * Also, you must define connect, getsockname, bind, accept, listen, and
- * select to their R-versions.
+ * select to their SOCKS-versions.
  */
 #undef SOCKS
 #undef SOCKS4
 #undef SOCKS5
 #undef connect
 #undef getsockname
+#undef getpeername
 #undef bind
 #undef accept
 #undef listen
 #undef select
+#undef recvfrom
+#undef sendto
+#undef recv
+#undef send
+#undef read
+#undef write
+#undef rresvport
+#undef shutdown
+#undef close
 #undef dup
 #undef dup2
 #undef fclose
 #undef gethostbyname
-#undef getpeername
-#undef read
-#undef recv
-#undef recvfrom
-#undef rresvport
-#undef send
-#undef sendto
-#undef shutdown
-#undef write
diff -r 717c60212a91 -r 024a7ee93ed7 net/tnftp/files/configure
--- a/net/tnftp/files/configure Sat Jun 25 04:41:14 2005 +0000
+++ b/net/tnftp/files/configure Sat Jun 25 07:00:41 2005 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.16 
+# From configure.in Revision: 1.17 
 
 
 
@@ -1121,79 +1121,17 @@
 
 
 
-
-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_func_search_save_LIBS="$LIBS"
-ac_cv_search_fparseln="no"
-cat > conftest.$ac_ext <<EOF
-#line 1134 "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 fparseln();
-
-int main() {
-fparseln()
-; return 0; }
-EOF
-if { (eval echo configure:1145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_search_fparseln="none required"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-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 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 fparseln();
-
-int main() {
-fparseln()
-; return 0; }
-EOF
-if { (eval echo configure:1167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_search_fparseln="-l$i"
-break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-done
-LIBS="$ac_func_search_save_LIBS"
-fi
-
-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
+echo "configure:1128: 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_func_search_save_LIBS="$LIBS"
 ac_cv_search_tgetent="no"