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 20050511.
details: https://anonhg.NetBSD.org/pkgsrc/rev/7d8ad22812db
branches: trunk
changeset: 493655:7d8ad22812db
user: lukem <lukem%pkgsrc.org@localhost>
date: Wed May 11 09:58:55 2005 +0000
description:
Merge tnftp 20050511.
(Future merges should be easier as this time I froze the vendor RCSIDs)
diffstat:
net/tnftp/files/COPYING | 2 +-
net/tnftp/files/ChangeLog | 101 ++++++++++++-
net/tnftp/files/Makefile.in | 2 +-
net/tnftp/files/README | 8 +-
net/tnftp/files/acconfig.h | 5 +-
net/tnftp/files/config.h.in | 5 +-
net/tnftp/files/configure | 166 ++++++++++---------
net/tnftp/files/configure.in | 104 +++++++-----
net/tnftp/files/libedit/chared.h | 2 +-
net/tnftp/files/libedit/editrc.5 | 2 +-
net/tnftp/files/libedit/el.h | 2 +-
net/tnftp/files/libedit/hist.h | 2 +-
net/tnftp/files/libedit/key.h | 2 +-
net/tnftp/files/libedit/makelist.in | 2 +-
net/tnftp/files/libedit/map.h | 2 +-
net/tnftp/files/libedit/prompt.h | 2 +-
net/tnftp/files/libedit/read.h | 2 +-
net/tnftp/files/libedit/readline/Makefile | 13 -
net/tnftp/files/libedit/refresh.h | 2 +-
net/tnftp/files/libedit/search.h | 2 +-
net/tnftp/files/libedit/sig.h | 2 +-
net/tnftp/files/libedit/tokenizer.h | 54 ------
net/tnftp/files/libnetbsd/err.c | 2 +-
net/tnftp/files/libnetbsd/fseeko.c | 2 +-
net/tnftp/files/libnetbsd/setprogname.c | 2 +-
net/tnftp/files/libnetbsd/strerror.c | 2 +-
net/tnftp/files/libnetbsd/timegm.c | 2 +-
net/tnftp/files/libnetbsd/utimes.c | 2 +-
net/tnftp/files/src/cmds.c | 248 +++++++++++++++--------------
net/tnftp/files/src/cmdtab.c | 16 +-
net/tnftp/files/src/domacro.c | 14 +-
net/tnftp/files/src/extern.h | 11 +-
net/tnftp/files/src/fetch.c | 25 +-
net/tnftp/files/src/ftp.1 | 50 ++++-
net/tnftp/files/src/ftp.c | 187 ++++++++++++---------
net/tnftp/files/src/ftp.cat1 | 27 +-
net/tnftp/files/src/ftp_var.h | 13 +-
net/tnftp/files/src/main.c | 40 ++--
net/tnftp/files/src/progressbar.c | 18 +-
net/tnftp/files/src/progressbar.h | 4 +-
net/tnftp/files/src/ruserpass.c | 14 +-
net/tnftp/files/src/util.c | 151 ++++++++++++++++--
net/tnftp/files/src/version.h | 5 +-
net/tnftp/files/tnftp.h | 24 ++-
net/tnftp/files/todo | 9 +-
45 files changed, 829 insertions(+), 523 deletions(-)
diffs (truncated from 2827 to 300 lines):
diff -r 9b584bc8b285 -r 7d8ad22812db net/tnftp/files/COPYING
--- a/net/tnftp/files/COPYING Wed May 11 09:51:27 2005 +0000
+++ b/net/tnftp/files/COPYING Wed May 11 09:58:55 2005 +0000
@@ -1,4 +1,4 @@
-$Id: COPYING,v 1.2 2005/01/04 23:44:24 lukem Exp $
+NetBSD: COPYING,v 1.4 2005/05/11 03:03:42 lukem Exp
Copyright (c) 2001-2005 The NetBSD Foundation, Inc.
All rights reserved.
diff -r 9b584bc8b285 -r 7d8ad22812db net/tnftp/files/ChangeLog
--- a/net/tnftp/files/ChangeLog Wed May 11 09:51:27 2005 +0000
+++ b/net/tnftp/files/ChangeLog Wed May 11 09:58:55 2005 +0000
@@ -1,4 +1,103 @@
-$Id: ChangeLog,v 1.2 2005/01/04 23:44:24 lukem Exp $
+NetBSD: ChangeLog,v 1.16 2005/05/11 04:21:53 lukem Exp
+
+Wed May 11 04:19:43 UTC 2005 lukem
+
+ * Release "tnftp 20050511"
+
+Wed May 11 04:10:01 UTC 2005 lukem
+
+ * Update the THANKS file.
+
+ * Only use poll() to implement xpoll() if it's available,
+ otherwise attempt to use select() if that's available,
+ otherwise #error.
+
+ * Detect if struct pollfd is available in <poll.h> or <sys/poll.h>.
+ Improve consistency in use of autoconf macros.
+
+Wed May 11 02:42:08 UTC 2005 lukem
+
+ * Merge NetBSD-ftp 20050511:
+ - Use socklen_t instead of int as the 5th argument to
+ getsockopt(). Improve invocation of setsockopt() and
+ associated failure messages.
+
+Wed May 11 01:46:29 UTC 2005 lukem
+
+ * Clean up RCSID usage in vendor-derived code, restoring original
+ IDs where possible.
+
+Wed May 11 00:08:16 UTC 2005 lukem
+
+ * Merge NetBSD-ftp 20050510:
+ - Prevent an overly-long input line causing a core dump when
+ editing is enabled.
+ Issue noted by Ryoji Kanai in FreeBSD Problem Report # 77158.
+ - Implement a timeout on the accept(2) in dataconn() and the
+ connect(2) in xconnect() by temporarily setting O_NONBLOCK
+ on the socket and using xpoll() to wait for the operation
+ to succeed. The timeout used is the '-q quittime' argument
+ (defaults to 60s for accept(2), and the system default for
+ connect(2)). Idea inspired by discussion with Chuck Cranor.
+ 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).
+ Unconditionally use xpoll() instead of conditionally using
+ select(2) or poll(2).
+ - In fetch_url(), don't call freeaddrinfo(res0) too early, as
+ we use pointers to its contents later in the function.
+ Problem found by Onno van der Linden.
+ - Fix ftp url reget when globs are being used.
+ Provided by Mathieu Arnold <mat%FreeBSD.org@localhost>.
+ - Factor out common string processing code eliminating static
+ buffers, making functions that should be static be static,
+ and cleaning up const usage. Added a guard against buffer
+ overflow, but the domap function is a bit too complicated
+ to tackle right now.
+ - Clean up whitespace.
+ - Expand description of http_proxy by suggesting the use of
+ RFC 1738 '%xx' encoding for "unsafe URL" characters in
+ usernames and passwords.
+
+Wed Jan 5 05:53:59 UTC 2005 lukem
+
+ * For now, assume libedit is not up-to-date and use our own version.
+
+ * Merge libedit from NetBSD 20020605 to 20050105. Changes include:
+ - Improve vi-mode.
+ - Delete-previous-char and delete-next-char without an
+ argument are not supposed to modify the yank buffer in
+ emacs-mode.
+ - Improve incremental searching.
+ - Improve memory allocation & usage.
+ - Move UCB-licensed code from 4-clause to 3-clause.
+ - Make the tokenization functions publically available.
+ - Various tty access bug-fixes.
+ - Improve readline emulation.
+
+Tue Jan 4 13:33:40 UTC 2005 lukem
+
+ * Unixware 7.1.1 implements RFC 2133 (Basic Socket Interface
+ Extensions for IPv6) but not the successor RFC 2553. The configure
+ script detects this and decides that tnftp needs to compile its own
+ version of getaddrinfo(). This produces the error message
+ /usr/include/netdb.h:248: `getaddrinfo' previously defined here
+ because Unixware provides an implementation of getaddrinfo() in
+ netdb.h instead of a prototype declaration :-/. Since netdb.h
+ cannot be omitted, we will always get this definition and tnftp's
+ version of getaddrinfo will always create a conflict. This ugly
+ preprocessor hack works around the problem. Hints for a better
+ solution welcome. Fix from pkgsrc/net/tnftp.
+
+ * Workaround poll() being a compatibility function on Darwin 7
+ (MacOSX 10.3) by adding a custom test for _POLL_EMUL_H_ which
+ is defined in poll.h on some MacOSX 10.3 systems. Not all 10.3
+ systems have poll.h, so only do the poll() test if at least one
+ of the header files is found. Fix from pkgsrc/net/tnftp.
+
+ * Add a utimes() replacement (using utime()) for Interix.
+ From pkgsrc/net/tnftp.
Mon Jan 3 10:21:57 UTC 2005 lukem
diff -r 9b584bc8b285 -r 7d8ad22812db net/tnftp/files/Makefile.in
--- a/net/tnftp/files/Makefile.in Wed May 11 09:51:27 2005 +0000
+++ b/net/tnftp/files/Makefile.in Wed May 11 09:58:55 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.1.1.3 2005/05/11 09:03:42 lukem Exp $
+# NetBSD: Makefile.in,v 1.3 2005/05/11 03:03:42 lukem Exp
#
srcdir = @srcdir@
diff -r 9b584bc8b285 -r 7d8ad22812db net/tnftp/files/README
--- a/net/tnftp/files/README Wed May 11 09:51:27 2005 +0000
+++ b/net/tnftp/files/README Wed May 11 09:58:55 2005 +0000
@@ -42,7 +42,8 @@
FEEDBACK / BUG REPORTS
----------------------
-Please email feedback back to the maintainer: <lukem%NetBSD.org@localhost>.
+Please email feedback back to the maintainer:
+ Luke Mewburn <lukem%NetBSD.org@localhost>.
COPYRIGHT
@@ -57,3 +58,8 @@
The primary ftp site for tnftp is:
ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp/
+
+
+DOCUMENT REFERENCE
+------------------
+NetBSD: README,v 1.6 2005/05/11 03:05:52 lukem Exp
diff -r 9b584bc8b285 -r 7d8ad22812db net/tnftp/files/acconfig.h
--- a/net/tnftp/files/acconfig.h Wed May 11 09:51:27 2005 +0000
+++ b/net/tnftp/files/acconfig.h Wed May 11 09:58:55 2005 +0000
@@ -1,4 +1,4 @@
-/* $Id: acconfig.h,v 1.2 2004/04/25 02:48:12 grant Exp $ */
+/* NetBSD: acconfig.h,v 1.6 2005/05/11 03:10:05 lukem Exp */
@TOP@
@BOTTOM@
@@ -69,6 +69,9 @@
/* Define if we have poll() and it is not emulated */
#undef HAVE_POLL
+/* Define if we have struct pollfd in <poll.h> or <sys/poll.h> */
+#undef HAVE_STRUCT_POLLFD
+
/*
* Define this if compiling with SOCKS (the firewall traversal library).
* Also, you must define connect, getsockname, bind, accept, listen, and
diff -r 9b584bc8b285 -r 7d8ad22812db net/tnftp/files/config.h.in
--- a/net/tnftp/files/config.h.in Wed May 11 09:51:27 2005 +0000
+++ b/net/tnftp/files/config.h.in Wed May 11 09:58:55 2005 +0000
@@ -1,5 +1,5 @@
/* config.h.in. Generated automatically from configure.in by autoheader. */
-/* $Id: config.h.in,v 1.4 2005/01/04 23:51:00 lukem Exp $ */
+/* NetBSD: config.h.in,v 1.8 2005/05/11 03:10:26 lukem Exp */
/* Define if on AIX 3.
@@ -255,6 +255,9 @@
/* Define if we have poll() and it is not emulated */
#undef HAVE_POLL
+/* Define if we have struct pollfd in <poll.h> or <sys/poll.h> */
+#undef HAVE_STRUCT_POLLFD
+
/*
* Define this if compiling with SOCKS (the firewall traversal library).
* Also, you must define connect, getsockname, bind, accept, listen, and
diff -r 9b584bc8b285 -r 7d8ad22812db net/tnftp/files/configure
--- a/net/tnftp/files/configure Wed May 11 09:51:27 2005 +0000
+++ b/net/tnftp/files/configure Wed May 11 09:58:55 2005 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
-# From configure.in Revision: 1.4
+# From configure.in Revision: 1.12
@@ -2386,7 +2386,7 @@
fi
-for ac_hdr in arpa/nameser.h err.h regex.h paths.h \
+for ac_hdr in arpa/nameser.h err.h regex.h paths.h poll.h sys/poll.h \
sys/syslimits.h termcap.h util.h libutil.h vis.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
@@ -3713,58 +3713,14 @@
fi
-# handle Darwin 7 having a poll() compatibility function. be
-# conservative, if we don't find one of poll.h or sys/poll.h, don't
-# attempt to use poll().
-for ac_hdr in poll.h sys/poll.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3724: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3729 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-done
-
-
if test $ac_cv_header_poll_h = yes || test $ac_cv_header_sys_poll_h = yes; then
echo $ac_n "checking for poll""... $ac_c" 1>&6
-echo "configure:3763: checking for poll" >&5
+echo "configure:3719: checking for poll" >&5
if eval "test \"`echo '$''{'ac_cv_func_poll'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3768 "configure"
+#line 3724 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char poll(); below. */
@@ -3787,7 +3743,7 @@
; return 0; }
EOF
-if { (eval echo configure:3791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_poll=yes"
else
@@ -3803,29 +3759,31 @@
echo "$ac_t""yes" 1>&6
echo $ac_n "checking if poll() is implemented natively""... $ac_c" 1>&6
-echo "configure:3807: checking if poll() is implemented natively" >&5
+echo "configure:3763: checking if poll() is implemented natively" >&5
if eval "test \"`echo '$''{'ftp_cv_POLL_NATIVE'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3813 "configure"
+#line 3769 "configure"
#include "confdefs.h"
- #if HAVE_POLL_H
- #include <poll.h>
- #endif
- #if HAVE_SYS_POLL_H
- #include <sys/poll.h>
- #endif
-
+
+#if HAVE_POLL_H
Home |
Main Index |
Thread Index |
Old Index