pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/tnftp/files merge tnftp 20050610
details: https://anonhg.NetBSD.org/pkgsrc/rev/b714dce1edc8
branches: trunk
changeset: 495452:b714dce1edc8
user: lukem <lukem%pkgsrc.org@localhost>
date: Fri Jun 10 05:06:25 2005 +0000
description:
merge tnftp 20050610
diffstat:
net/tnftp/files/COPYING | 4 +-
net/tnftp/files/ChangeLog | 142 ++++++++-
net/tnftp/files/config.h.in | 5 +-
net/tnftp/files/configure | 441 +++++++++++++++++----------
net/tnftp/files/configure.in | 8 +-
net/tnftp/files/libedit/Makefile.in | 10 +-
net/tnftp/files/libedit/chared.c | 15 +-
net/tnftp/files/libedit/common.c | 13 +-
net/tnftp/files/libedit/editline.3 | 10 +-
net/tnftp/files/libedit/el.c | 13 +-
net/tnftp/files/libedit/emacs.c | 13 +-
net/tnftp/files/libedit/hist.c | 13 +-
net/tnftp/files/libedit/histedit.h | 5 +-
net/tnftp/files/libedit/history.c | 13 +-
net/tnftp/files/libedit/key.c | 13 +-
net/tnftp/files/libedit/map.c | 13 +-
net/tnftp/files/libedit/parse.c | 17 +-
net/tnftp/files/libedit/parse.h | 6 +-
net/tnftp/files/libedit/prompt.c | 13 +-
net/tnftp/files/libedit/read.c | 20 +-
net/tnftp/files/libedit/readline/readline.h | 9 +-
net/tnftp/files/libedit/refresh.c | 13 +-
net/tnftp/files/libedit/search.c | 13 +-
net/tnftp/files/libedit/sig.c | 15 +-
net/tnftp/files/libedit/sys.h | 8 +-
net/tnftp/files/libedit/term.c | 13 +-
net/tnftp/files/libedit/term.h | 5 +-
net/tnftp/files/libedit/tokenizer.c | 13 +-
net/tnftp/files/libedit/tty.c | 27 +-
net/tnftp/files/libedit/tty.h | 6 +-
net/tnftp/files/libedit/vi.c | 21 +-
net/tnftp/files/libnetbsd/Makefile.in | 10 +-
net/tnftp/files/libnetbsd/ftpglob.h | 10 +-
net/tnftp/files/libnetbsd/ftpvis.h | 15 +-
net/tnftp/files/libnetbsd/getnameinfo.c | 14 +-
net/tnftp/files/libnetbsd/glob.c | 22 +-
net/tnftp/files/libnetbsd/inet_ntop.c | 96 +++--
net/tnftp/files/libnetbsd/inet_pton.c | 79 ++--
net/tnftp/files/libnetbsd/mkstemp.c | 18 +-
net/tnftp/files/libnetbsd/sl_init.c | 11 +-
net/tnftp/files/libnetbsd/strdup.c | 10 +-
net/tnftp/files/libnetbsd/strlcat.c | 46 +-
net/tnftp/files/libnetbsd/strlcpy.c | 39 +-
net/tnftp/files/libnetbsd/strsep.c | 10 +-
net/tnftp/files/libnetbsd/strtoll.c | 25 +-
net/tnftp/files/libnetbsd/strunvis.c | 91 +++-
net/tnftp/files/libnetbsd/strvis.c | 396 ++++++++++++++++++------
net/tnftp/files/libnetbsd/usleep.c | 10 +-
net/tnftp/files/src/Makefile.in | 22 +-
net/tnftp/files/src/cmds.c | 63 +--
net/tnftp/files/src/cmdtab.c | 17 +-
net/tnftp/files/src/complete.c | 17 +-
net/tnftp/files/src/domacro.c | 13 +-
net/tnftp/files/src/extern.h | 14 +-
net/tnftp/files/src/fetch.c | 59 +-
net/tnftp/files/src/ftp.c | 48 +-
net/tnftp/files/src/main.c | 55 +--
net/tnftp/files/src/progressbar.c | 25 +-
net/tnftp/files/src/ruserpass.c | 23 +-
net/tnftp/files/src/util.c | 316 ++++++++++++-------
net/tnftp/files/src/version.h | 5 +-
net/tnftp/files/tnftp.h | 48 +-
62 files changed, 1425 insertions(+), 1132 deletions(-)
diffs (truncated from 5673 to 300 lines):
diff -r 0144cfbd792c -r b714dce1edc8 net/tnftp/files/COPYING
--- a/net/tnftp/files/COPYING Fri Jun 10 04:52:08 2005 +0000
+++ b/net/tnftp/files/COPYING Fri Jun 10 05:06:25 2005 +0000
@@ -1,4 +1,4 @@
-NetBSD: COPYING,v 1.4 2005/05/11 03:03:42 lukem Exp
+NetBSD: COPYING,v 1.5 2005/05/28 13:15:14 lukem Exp
Copyright (c) 2001-2005 The NetBSD Foundation, Inc.
All rights reserved.
@@ -42,11 +42,13 @@
This product includes software developed by the NetBSD Foundation,
Inc. and its contributors. Those contributors include:
+ - Simon Burge
- Jaromir Dolecek
- Klaus Klein
- Luke Mewburn
- Jason R. Thorpe of the Numerical Aerospace Simulation
Facility, NASA Ames Research Center.
+ - Christos Zoulas
This product includes software developed by the University of
California, Berkeley and its contributors. Those contributors include:
diff -r 0144cfbd792c -r b714dce1edc8 net/tnftp/files/ChangeLog
--- a/net/tnftp/files/ChangeLog Fri Jun 10 04:52:08 2005 +0000
+++ b/net/tnftp/files/ChangeLog Fri Jun 10 05:06:25 2005 +0000
@@ -1,4 +1,144 @@
-NetBSD: ChangeLog,v 1.17 2005/05/14 04:46:26 lukem Exp
+NetBSD: ChangeLog,v 1.27 2005/06/10 04:40:13 lukem Exp
+
+Fri Jun 10 04:39:33 UTC 2005 lukem
+
+ * Release as "tnftp 20050610"
+
+ * Add dependencies on ${srcdir}/../tnftp.h and ../config.h
+
+ * Merge NetBSD ftp from 20050609 to 20050610. Changes:
+ - Implement getline() to read a line into a buffer.
+ - Convert to use getline() instead of fgets() whenever reading
+ user input to ensure that an overly long input line doesn't
+ leave excess characters for the next input operation to
+ accidentally use as input.
+ - Zero out the password & account after we've finished with it.
+ - Consistently use getpass(3) (i.e, character echo suppressed)
+ when reading the account data. For some reason, historically
+ the "login" code suppressed echo for Account: yet the "user"
+ command did not!
+ - Display the hostname in the "getaddrinfo failed" warning.
+ - Appease some -Wcast-qual warnings. Fixing all of these
+ requires significant code refactoring. (mmm, legacy code).
+
+Thu Jun 9 16:49:05 UTC 2005 lukem
+
+ * src, libnetbsd: Excise RCSID block, rather than using
+ #if 0 ... #endif. The point was to minimise RCSID
+ conflicts, and the latter isn't helping there.
+
+ * Merge NetBSD ftp from 20050531 to 20050609. Changes:
+ - Only print the "Trying <address>..." message if verbose
+ and there's more than one struct addrinfo in the
+ getaddrinfo() result.
+ - Don't use non-standard "u_int".
+
+Wed Jun 1 15:08:01 UTC 2005 lukem
+
+ * Look for dirname(3), which may be in -lgen on IRIX, and
+ replace it if not found..
+
+Wed Jun 1 11:48:58 UTC 2005 lukem
+
+ * libnetbsd:
+ - Don't use non-standard: u_char u_short u_int.
+ - Use uint32_t instead of u_int32_t.
+ - Don't use register.
+
+ * libedit: Don't use non-standard uint or u_int.
+
+Tue May 31 02:23:08 UTC 2005 lukem
+
+ * tnftp.h: need <libgen.h> for dirname(3)
+
+ * Merge ftp from 20050513 to 20050531. Changes:
+ - Helps if the definition of xconnect() matches its
+ declaration....
+ - Fix some cast issues highlighted by Scott Reynolds using
+ gcc 4 on OSX.4
+ - Use size_t instead of int where appropriate.
+ - Make this compile on sparc64 (size_t != int).
+ - Printf field widths and size_t don't always mix well, so
+ cast to int. Fixes build problem for alpha.
+ - Some const cleanups.
+ - tab cleanup
+ - Improve method used in fileindir() to determine if `file'
+ is in or under `dir': realpath(3) on non-NetBSD systems may
+ fail if the target filename doesn't exist, so instead use
+ realpath(3) on the parent directory of `file'.
+ Per discussion with Todd Eigenschink.
+ - formatbuf(): fix %m and %M to use the hostname, not the
+ username.
+ - fetch_ftp(): preserve 'anonftp' across a disconnect() so
+ that multiple ftp auto-fetches on the same command line
+ login automatically.
+ - auto_fetch(): use an initialized volatile int to appease
+ IRIX cc.
+
+ * Merge libedit from NetBSD 20050105 to 20050531. Changes include:
+ - Rui Paulo: Incorrect tok_line and tok_str declarations.
+ - Remove clause 3 from the UCB license.
+ - Luke Mewburn: Don't abuse unconstify'ing a string
+ and writing to it, because you'll core dump. Also remove
+ extra const that gives pain to the irix compiler.
+ - Make sure we flush after we prepare when we are unbuffered
+ otherwise the prompt will not appear immediately.
+ - Terminate the arglist with a NULL instead of 0.
+ (Shuts up gcc4.x)
+
+Sat May 28 13:19:38 UTC 2005 lukem
+
+ * libnetbsd/strvis.c:
+ - Sync to NetBSD's vis.c 1.33:
+ Use malloc(3) instead of alloca(3).
+ - Remove extraenous #endif
+
+Fri May 27 05:46:58 UTC 2005 lukem
+
+ * libnetbsd/strvis.c: Sync to NetBSD's vis.c 1.30:
+ Use a more standard TNF license.
+
+ * libedit/sig.c: Include "src/progressbar.h" for xsignal_restart()
+ prototype.
+
+ * Ensure that fallback #define of __attribute__ is available.
+ Fixes build problem on HP-UX with cc.
+
+Thu May 26 14:21:08 UTC 2005 lukem
+
+ * Extend xpoll()'s HAVE_SELECT implementation to support POLLRDNORM,
+ POLLWRNORM, and POLLRDBAND - the latter using exceptfds.
+ Per discussion with Christos Zoulas.
+
+Mon May 16 13:33:27 UTC 2005 lukem
+
+ * Pull in <poll.h> or <sys/poll.h> if they exist even if we're
+ not using poll, as struct pollfd might exist in those.
+ Fixes build problem on OSX.3.
+
+ * Separate CPPFLAGS from CFLAGS.
+
+ * Sync various files in libnetbsd with the original versions
+ in NetBSD. Notable changes
+ - Convert 4 clause UCB license to 3 clause.
+ - Use strlcpy instead of strcpy.
+ - Update ISC copyright.
+ - Use NS_INADDRSZ, NS_IN6ADDRSZ and NS_INT16SZ instead of
+ equivalents without NS_ prefix.
+ - Use socklen_t instead of size_t where appropriate.
+ - Improve bounds checking.
+ - Don't update the size of allocated storage until
+ realloc succeeds.
+ - Fix comment about return value.
+ - Reverse the order of two loop invariant to make
+ 'strlcat(0, "foo", 0)' not get a SEGV.
+ - Use Todd C. Miller's latest copyright notice (more loose).
+ - Use "long long" instead of "quad" in various
+ comments & constants.
+ - Support VIS_HTTPSTYLE.
+ - Implement svis(), strsvis(), strsvisx(), strunvisx().
+
+ * Prefer poll over select when implementing replacement usleep().
Sat May 14 04:44:35 UTC 2005 lukem
diff -r 0144cfbd792c -r b714dce1edc8 net/tnftp/files/config.h.in
--- a/net/tnftp/files/config.h.in Fri Jun 10 04:52:08 2005 +0000
+++ b/net/tnftp/files/config.h.in Fri Jun 10 05:06:25 2005 +0000
@@ -1,5 +1,5 @@
/* config.h.in. Generated automatically from configure.in by autoheader. */
-/* NetBSD: config.h.in,v 1.9 2005/05/14 04:41:27 lukem Exp */
+/* NetBSD: config.h.in,v 1.10 2005/06/01 15:10:21 lukem Exp */
/* Define if on AIX 3.
@@ -45,6 +45,9 @@
/* The number of bytes in a off_t. */
#undef SIZEOF_OFF_T
+/* Define if you have the dirname function. */
+#undef HAVE_DIRNAME
+
/* Define if you have the err function. */
#undef HAVE_ERR
diff -r 0144cfbd792c -r b714dce1edc8 net/tnftp/files/configure
--- a/net/tnftp/files/configure Fri Jun 10 04:52:08 2005 +0000
+++ b/net/tnftp/files/configure Fri Jun 10 05:06:25 2005 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
-# From configure.in Revision: 1.13
+# From configure.in Revision: 1.16
@@ -1310,15 +1310,77 @@
fi
fi
+echo $ac_n "checking for library containing dirname""... $ac_c" 1>&6
+echo "configure:1315: checking for library containing dirname" >&5
+if eval "test \"`echo '$''{'ac_cv_search_dirname'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_func_search_save_LIBS="$LIBS"
+ac_cv_search_dirname="no"
+cat > conftest.$ac_ext <<EOF
+#line 1322 "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 dirname();
+
+int main() {
+dirname()
+; return 0; }
+EOF
+if { (eval echo configure:1333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ac_cv_search_dirname="none required"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+test "$ac_cv_search_dirname" = "no" && for i in gen; do
+LIBS="-l$i $ac_func_search_save_LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1344 "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 dirname();
+
+int main() {
+dirname()
+; return 0; }
+EOF
+if { (eval echo configure:1355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ac_cv_search_dirname="-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_dirname" 1>&6
+if test "$ac_cv_search_dirname" != "no"; then
+ test "$ac_cv_search_dirname" = "none required" || LIBS="$ac_cv_search_dirname $LIBS"
+ have_dirname=yes
+else :
+ have_dirname=no
+fi
+
# Most operating systems have gethostbyname() in the default searched
# libraries (i.e. libc):
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:1317: checking for gethostbyname" >&5
+echo "configure:1379: checking for gethostbyname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1322 "configure"
+#line 1384 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
@@ -1341,7 +1403,7 @@
; return 0; }
EOF
-if { (eval echo configure:1345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
@@ -1360,7 +1422,7 @@
echo "$ac_t""no" 1>&6
# Some OSes (eg. Solaris) place it in libnsl:
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:1364: checking for gethostbyname in -lnsl" >&5
+echo "configure:1426: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
Home |
Main Index |
Thread Index |
Old Index