CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sat Sep 23 04:50:32 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp: configure.ac tnftp.h

Log Message:
editorial fixes


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 othersrc/usr.bin/tnftp/configure.ac
cvs rdiff -u -r1.39 -r1.40 othersrc/usr.bin/tnftp/tnftp.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/configure.ac
diff -u othersrc/usr.bin/tnftp/configure.ac:1.48 othersrc/usr.bin/tnftp/configure.ac:1.49
--- othersrc/usr.bin/tnftp/configure.ac:1.48	Sun May  7 18:32:11 2023
+++ othersrc/usr.bin/tnftp/configure.ac	Sat Sep 23 04:50:32 2023
@@ -1,4 +1,4 @@
-#   $NetBSD: configure.ac,v 1.48 2023/05/07 18:32:11 lukem Exp $
+#   $NetBSD: configure.ac,v 1.49 2023/09/23 04:50:32 lukem Exp $
 #
 # Process this file with autoconf to produce a configure script.
 
@@ -336,7 +336,7 @@ AC_CHECK_FUNCS([getcwd gethostbyaddr get
 AS_IF([test "$ac_cv_func_getpgrp" = yes], [AC_FUNC_GETPGRP])
 AS_IF([test "$ac_cv_func_strptime" = yes], [AC_CHECK_DECLS([strptime])])
 
-# Use system glob if GLOB_BRACE and GLOB_TILDE are available.
+# Use system glob if required GLOB_ flags are available.
 #
 use_local_glob=yes
 AC_CHECK_HEADER([glob.h],
@@ -346,7 +346,7 @@ AC_CHECK_HEADER([glob.h],
 int f = GLOB_BRACE|GLOB_NOCHECK|GLOB_TILDE;
 ]])],
  [AC_MSG_RESULT([yes])
-			  use_local_glob=no],
+  use_local_glob=no],
  [AC_MSG_RESULT([no - using local version])],
  [AC_MSG_RESULT([unknown - cross-compiling])])])
 AS_IF([test "$use_local_glob" = yes],

Index: othersrc/usr.bin/tnftp/tnftp.h
diff -u othersrc/usr.bin/tnftp/tnftp.h:1.39 othersrc/usr.bin/tnftp/tnftp.h:1.40
--- othersrc/usr.bin/tnftp/tnftp.h:1.39	Sat Jul  4 14:47:35 2020
+++ othersrc/usr.bin/tnftp/tnftp.h	Sat Sep 23 04:50:32 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: tnftp.h,v 1.39 2020/07/04 14:47:35 lukem Exp $	*/
+/*	$NetBSD: tnftp.h,v 1.40 2023/09/23 04:50:32 lukem Exp $	*/
 
 #ifndef TNFTP_H
 #define TNFTP_H 1
@@ -170,7 +170,7 @@ struct pollfd {
 # include 
 #endif
 
-#if defined(USE_GLOB_H)	/* not set by configure; used by other build systems */
+#if defined(USE_GLOB_H)
 # include 
 #else
 # include "ftpglob.h"

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sat Sep 23 04:50:32 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp: configure.ac tnftp.h

Log Message:
editorial fixes


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 othersrc/usr.bin/tnftp/configure.ac
cvs rdiff -u -r1.39 -r1.40 othersrc/usr.bin/tnftp/tnftp.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sun May  7 18:32:11 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp: ChangeLog NEWS configure configure.ac

Log Message:
tnftp 20230507 release

Changes since tnftp 20230409
* Add timeout for SSL connection setup, defaulting to 60 seconds.
* Update to NetBSD-ftp 20230505.


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 othersrc/usr.bin/tnftp/ChangeLog
cvs rdiff -u -r1.17 -r1.18 othersrc/usr.bin/tnftp/NEWS
cvs rdiff -u -r1.62 -r1.63 othersrc/usr.bin/tnftp/configure
cvs rdiff -u -r1.47 -r1.48 othersrc/usr.bin/tnftp/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/ChangeLog
diff -u othersrc/usr.bin/tnftp/ChangeLog:1.80 othersrc/usr.bin/tnftp/ChangeLog:1.81
--- othersrc/usr.bin/tnftp/ChangeLog:1.80	Sat May  6 09:45:20 2023
+++ othersrc/usr.bin/tnftp/ChangeLog	Sun May  7 18:32:11 2023
@@ -1,6 +1,12 @@
-$NetBSD: ChangeLog,v 1.80 2023/05/06 09:45:20 lukem Exp $
+$NetBSD: ChangeLog,v 1.81 2023/05/07 18:32:11 lukem Exp $
 
-Sat May  6 09:43:04 UTC 2023
+Sun May  7 18:30:03 UTC 2023	lukem
+
+	* Release as "tnftp 20230507".
+
+	* Consistency fixes in ChangeLog and NEWS.
+
+Sat May  6 09:43:04 UTC 2023	lukem
 
 	* Merge NetBSD ftp from 20230226 to 20230505:
 		* Add timeout for SSL connection setup, defaulting to 60
@@ -9,7 +15,7 @@ Sat May  6 09:43:04 UTC 2023
 		* Check EAGAIN as well as EINTR.
 		* Simplify includes.
 
-Sun Apr  9 06:45:06 UTC 2023
+Sun Apr  9 06:45:06 UTC 2023	lukem
 
 	* Release as "tnftp 20230409".
 
@@ -29,7 +35,7 @@ Sun Apr  9 06:45:06 UTC 2023
 		* Equivalent to "NetBSD-ftp 20230225" with documentation
 		  and portability fixes.
 
-Fri Aug 27 02:06:34 UTC 2021
+Fri Aug 27 02:06:34 UTC 2021	lukem
 
 	* Release as "tnftp 20210827".
 
@@ -47,7 +53,7 @@ Fri Aug 27 02:06:34 UTC 2021
 		  data connection elsewhere.
 		* Remove unnecessary variable assignments.
 
-Wed Aug 25 01:48:47 UTC 2021
+Wed Aug 25 01:48:47 UTC 2021	lukem
 
 	* configure:
 		* Update to automake 1.16.1.

Index: othersrc/usr.bin/tnftp/NEWS
diff -u othersrc/usr.bin/tnftp/NEWS:1.17 othersrc/usr.bin/tnftp/NEWS:1.18
--- othersrc/usr.bin/tnftp/NEWS:1.17	Sun Apr  9 06:49:34 2023
+++ othersrc/usr.bin/tnftp/NEWS	Sun May  7 18:32:11 2023
@@ -1,8 +1,14 @@
-$NetBSD: NEWS,v 1.17 2023/04/09 06:49:34 lukem Exp $
+$NetBSD: NEWS,v 1.18 2023/05/07 18:32:11 lukem Exp $
 
-This is tnftp version 20230409.
+This is tnftp version 20230507.
 
-Changes in tnftp 20210827 to 20230409:
+Changes in tnftp from 20230409 to 20230507:
+
+	Add timeout for SSL connection setup, defaulting to 60 seconds.
+
+	Update to NetBSD-ftp 20230505.
+
+Changes in tnftp from 20210827 to 20230409:
 
 	Validate SSL certificates by default, disabled with
 	FTPSSLNOVERIFY=1 in the environment, or option sslnoverify.
@@ -16,7 +22,7 @@ Changes in tnftp 20210827 to 20230409:
 
 	Update to NetBSD-ftp 20230225.
 
-Changes in tnftp 20200705 to 20210827:
+Changes in tnftp from 20200705 to 20210827:
 
 	Validate address in server's PASV and LPSV responses. Previously a
 	hostile server could cause ftp to open a data connection elsewhere.
@@ -36,7 +42,7 @@ Changes in tnftp 20200705 to 20210827:
 
 	Display usage to stdout with -?.
 
-Changes in tnftp 20151004 to 20200705:
+Changes in tnftp from 20151004 to 20200705:
 
 	Avoid crashes by exiting if lostpeer due to a signal
 	(e.g., remote server disconnection).
@@ -67,7 +73,7 @@ Changes in tnftp 20151004 to 20200705:
 
 	Portability improvements.
 
-Changes in tnftp 20141104 to 20151004:
+Changes in tnftp from 20141104 to 20151004:
 
 	Implement '-x xferbufsize' to set xferbuf size.
 

Index: othersrc/usr.bin/tnftp/configure
diff -u othersrc/usr.bin/tnftp/configure:1.62 othersrc/usr.bin/tnftp/configure:1.63
--- othersrc/usr.bin/tnftp/configure:1.62	Sun Apr  9 06:57:25 2023
+++ othersrc/usr.bin/tnftp/configure	Sun May  7 18:32:11 2023
@@ -1,7 +1,6 @@
 #! /bin/sh
-# From configure.ac Revision: 1.46 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for tnftp 20230409.
+# Generated by GNU Autoconf 2.69 for tnftp 20230507.
 #
 # Report bugs to .
 #
@@ -596,8 +595,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='tnftp'
 PACKAGE_TARNAME='tnftp'
-PACKAGE_VERSION='20230409'
-PACKAGE_STRING='tnftp 20230409'
+PACKAGE_VERSION='20230507'
+PACKAGE_STRING='tnftp 20230507'
 PACKAGE_BUGREPORT='lu...@netbsd.org'
 PACKAGE_URL=''
 
@@ -1341,7 +1340,7 @@ if test "$ac_init_help" = "long"; then
   # 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 tnftp 20230409 to adapt to many kinds of systems.
+\`configure' configures tnftp 20230507 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1411,7 +1410,7 @@ fi
 
 if test -n "$ac_init_h

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sun May  7 18:32:11 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp: ChangeLog NEWS configure configure.ac

Log Message:
tnftp 20230507 release

Changes since tnftp 20230409
* Add timeout for SSL connection setup, defaulting to 60 seconds.
* Update to NetBSD-ftp 20230505.


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 othersrc/usr.bin/tnftp/ChangeLog
cvs rdiff -u -r1.17 -r1.18 othersrc/usr.bin/tnftp/NEWS
cvs rdiff -u -r1.62 -r1.63 othersrc/usr.bin/tnftp/configure
cvs rdiff -u -r1.47 -r1.48 othersrc/usr.bin/tnftp/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sun May  7 18:21:15 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp: configure.ac

Log Message:
configure.ac: deprecate AC_REVISION

Allows regen as part of the release commit / tag


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 othersrc/usr.bin/tnftp/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/configure.ac
diff -u othersrc/usr.bin/tnftp/configure.ac:1.46 othersrc/usr.bin/tnftp/configure.ac:1.47
--- othersrc/usr.bin/tnftp/configure.ac:1.46	Sun Apr  9 06:49:34 2023
+++ othersrc/usr.bin/tnftp/configure.ac	Sun May  7 18:21:15 2023
@@ -1,4 +1,4 @@
-#   $NetBSD: configure.ac,v 1.46 2023/04/09 06:49:34 lukem Exp $
+#   $NetBSD: configure.ac,v 1.47 2023/05/07 18:21:15 lukem Exp $
 #
 # Process this file with autoconf to produce a configure script.
 
@@ -9,7 +9,6 @@ AC_COPYRIGHT([
 Copyright (c) 1999-2023 The NetBSD Foundation, Inc.
 All rights reserved.
 ])
-AC_REVISION([$Revision: 1.46 $])
 
 AS_SHELL_SANITIZE()
 

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sun May  7 18:21:15 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp: configure.ac

Log Message:
configure.ac: deprecate AC_REVISION

Allows regen as part of the release commit / tag


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 othersrc/usr.bin/tnftp/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sat May  6 09:45:20 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp: ChangeLog

Log Message:
ChangeLog: import NetBSD ftp 20230505


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 othersrc/usr.bin/tnftp/ChangeLog

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/ChangeLog
diff -u othersrc/usr.bin/tnftp/ChangeLog:1.79 othersrc/usr.bin/tnftp/ChangeLog:1.80
--- othersrc/usr.bin/tnftp/ChangeLog:1.79	Sun Apr  9 06:49:34 2023
+++ othersrc/usr.bin/tnftp/ChangeLog	Sat May  6 09:45:20 2023
@@ -1,4 +1,13 @@
-$NetBSD: ChangeLog,v 1.79 2023/04/09 06:49:34 lukem Exp $
+$NetBSD: ChangeLog,v 1.80 2023/05/06 09:45:20 lukem Exp $
+
+Sat May  6 09:43:04 UTC 2023
+
+	* Merge NetBSD ftp from 20230226 to 20230505:
+		* Add timeout for SSL connection setup, defaulting to 60
+		  seconds.
+		* Consistently use poll(2) instead of select(2).
+		* Check EAGAIN as well as EINTR.
+		* Simplify includes.
 
 Sun Apr  9 06:45:06 UTC 2023
 

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sat May  6 09:45:20 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp: ChangeLog

Log Message:
ChangeLog: import NetBSD ftp 20230505


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 othersrc/usr.bin/tnftp/ChangeLog

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp/src

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sat May  6 09:32:18 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp/src: ftp.c ssl.c util.c version.h

Log Message:
Merge from tag NetBSD-20230226 to tag NetBSD-20230505


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 othersrc/usr.bin/tnftp/src/ftp.c
cvs rdiff -u -r1.9 -r1.10 othersrc/usr.bin/tnftp/src/ssl.c
cvs rdiff -u -r1.26 -r1.27 othersrc/usr.bin/tnftp/src/util.c
cvs rdiff -u -r1.11 -r1.12 othersrc/usr.bin/tnftp/src/version.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/src/ftp.c
diff -u othersrc/usr.bin/tnftp/src/ftp.c:1.24 othersrc/usr.bin/tnftp/src/ftp.c:1.25
--- othersrc/usr.bin/tnftp/src/ftp.c:1.24	Fri Aug 27 01:38:49 2021
+++ othersrc/usr.bin/tnftp/src/ftp.c	Sat May  6 09:32:18 2023
@@ -1,5 +1,5 @@
-/*	$NetBSD: ftp.c,v 1.24 2021/08/27 01:38:49 lukem Exp $	*/
-/*	from	NetBSD: ftp.c,v 1.174 2021/08/26 06:23:24 lukem Exp	*/
+/*	$NetBSD: ftp.c,v 1.25 2023/05/06 09:32:18 lukem Exp $	*/
+/*	from	NetBSD: ftp.c,v 1.175 2023/05/05 15:46:06 lukem Exp	*/
 
 /*-
  * Copyright (c) 1996-2021 The NetBSD Foundation, Inc.
@@ -98,7 +98,7 @@
 #if 0
 static char sccsid[] = "@(#)ftp.c	8.6 (Berkeley) 10/27/94";
 #else
-__RCSID(" NetBSD: ftp.c,v 1.174 2021/08/26 06:23:24 lukem Exp  ");
+__RCSID(" NetBSD: ftp.c,v 1.175 2023/05/05 15:46:06 lukem Exp  ");
 #endif
 #endif /* not lint */
 
@@ -1741,7 +1741,8 @@ dataconn(const char *lmode)
 		if (timeout < 0)
 			timeout = 0;
 		rv = ftp_poll(pfd, 1, timeout);
-	} while (rv == -1 && errno == EINTR);	/* loop until poll ! EINTR */
+			/* loop until poll !EINTR && !EAGAIN */
+	} while (rv == -1 && (errno == EINTR || errno == EAGAIN));
 	if (rv == -1) {
 		warn("Can't poll waiting before accept");
 		goto dataconn_failed;
@@ -1755,7 +1756,8 @@ dataconn(const char *lmode)
 	fromlen = myctladdr.su_len;
 	do {
 		s = accept(data, (struct sockaddr *) &from.si_su, &fromlen);
-	} while (s == -1 && errno == EINTR);	/* loop until accept ! EINTR */
+			/* loop until accept !EINTR && !EAGAIN */
+	} while (s == -1 && (errno == EINTR || errno == EAGAIN));
 	if (s == -1) {
 		warn("Can't accept data connection");
 		goto dataconn_failed;

Index: othersrc/usr.bin/tnftp/src/ssl.c
diff -u othersrc/usr.bin/tnftp/src/ssl.c:1.9 othersrc/usr.bin/tnftp/src/ssl.c:1.10
--- othersrc/usr.bin/tnftp/src/ssl.c:1.9	Sun Apr  9 06:17:55 2023
+++ othersrc/usr.bin/tnftp/src/ssl.c	Sat May  6 09:32:18 2023
@@ -1,5 +1,5 @@
-/*	$NetBSD: ssl.c,v 1.9 2023/04/09 06:17:55 lukem Exp $	*/
-/*	from	NetBSD: ssl.c,v 1.14 2023/04/09 06:10:03 lukem Exp	*/
+/*	$NetBSD: ssl.c,v 1.10 2023/05/06 09:32:18 lukem Exp $	*/
+/*	from	NetBSD: ssl.c,v 1.15 2023/05/05 15:46:06 lukem Exp	*/
 
 /*-
  * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
@@ -40,9 +40,10 @@
 
 #include 
 #ifndef lint
-__RCSID(" NetBSD: ssl.c,v 1.14 2023/04/09 06:10:03 lukem Exp  ");
+__RCSID(" NetBSD: ssl.c,v 1.15 2023/05/05 15:46:06 lukem Exp  ");
 #endif
 
+#include 
 #include 
 #include 
 #include 
@@ -53,7 +54,6 @@ __RCSID(" NetBSD: ssl.c,v 1.14 2023/04/0
 #include 
 
 #include 
-#include 
 #include 
 
 #include 
@@ -103,38 +103,33 @@ struct fetch_connect {
 static ssize_t
 fetch_writev(struct fetch_connect *conn, struct iovec *iov, int iovcnt)
 {
-	struct timeval now, timeout, delta;
-	fd_set writefds;
+	struct timeval timeout, now, delta;
 	ssize_t len, total;
 	int fd = conn->sd;
-	int r;
+	int rv, timeout_secs;
+	struct pollfd pfd[1];
 
-	if (quit_time > 0) {
-		FD_ZERO(&writefds);
-		gettimeofday(&timeout, NULL);
-		timeout.tv_sec += quit_time;
-	}
+	pfd[0].fd = fd;
+	pfd[0].events = POLLOUT;
+	gettimeofday(&timeout, NULL);
+	timeout.tv_sec += quit_time;
 
 	total = 0;
 	while (iovcnt > 0) {
-		while (quit_time > 0 && !FD_ISSET(fd, &writefds)) {
-			FD_SET(fd, &writefds);
-			gettimeofday(&now, NULL);
-			delta.tv_sec = timeout.tv_sec - now.tv_sec;
-			delta.tv_usec = timeout.tv_usec - now.tv_usec;
-			if (delta.tv_usec < 0) {
-delta.tv_usec += 100;
-delta.tv_sec--;
-			}
-			if (delta.tv_sec < 0) {
-errno = ETIMEDOUT;
+		if (quit_time > 0) {	/* enforce timeout */
+			do {
+(void)gettimeofday(&now, NULL);
+timersub(&timeout, &now, &delta);
+timeout_secs = delta.tv_sec * 1000 + delta.tv_usec/1000;
+if (timeout_secs < 0)
+	timeout_secs = 0;
+rv = ftp_poll(pfd, 1, timeout_secs);
+	/* loop until poll !EINTR && !EAGAIN */
+			} while (rv == -1 && (errno == EINTR || errno == EAGAIN));
+			if (rv == -1)
 return -1;
-			}
-			errno = 0;
-			r = select(fd + 1, NULL, &writefds, NULL, &delta);
-			if (r == -1) {
-if (errno == EINTR)
-	continue;
+			if (rv == 0) {
+errno = ETIMEDOUT;
 return -1;
 			}
 		}
@@ -337,7 +332,7 @@ fetch_nonssl_read(int sd, void *buf, siz
 
 	rlen = read(sd, buf, len);
 	if (rlen == -1) {
-		if (errno == EAGAIN || errno == EINTR)
+		if (errno == EINTR || errno == EAGAIN)
 

CVS commit: othersrc/usr.bin/tnftp/src

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sat May  6 09:32:18 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp/src: ftp.c ssl.c util.c version.h

Log Message:
Merge from tag NetBSD-20230226 to tag NetBSD-20230505


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 othersrc/usr.bin/tnftp/src/ftp.c
cvs rdiff -u -r1.9 -r1.10 othersrc/usr.bin/tnftp/src/ssl.c
cvs rdiff -u -r1.26 -r1.27 othersrc/usr.bin/tnftp/src/util.c
cvs rdiff -u -r1.11 -r1.12 othersrc/usr.bin/tnftp/src/version.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sun Apr  9 06:57:25 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp: Makefile.in configure

Log Message:
regen for tnftp 20230409


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 othersrc/usr.bin/tnftp/Makefile.in
cvs rdiff -u -r1.61 -r1.62 othersrc/usr.bin/tnftp/configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/Makefile.in
diff -u othersrc/usr.bin/tnftp/Makefile.in:1.15 othersrc/usr.bin/tnftp/Makefile.in:1.16
--- othersrc/usr.bin/tnftp/Makefile.in:1.15	Sun Apr  9 06:30:14 2023
+++ othersrc/usr.bin/tnftp/Makefile.in	Sun Apr  9 06:57:25 2023
@@ -172,8 +172,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in 
 	$(top_srcdir)/buildaux/ltmain.sh \
 	$(top_srcdir)/buildaux/missing COPYING ChangeLog INSTALL NEWS \
 	README THANKS buildaux/ar-lib buildaux/compile \
-	buildaux/config.guess buildaux/config.sub buildaux/install-sh \
-	buildaux/ltmain.sh buildaux/missing
+	buildaux/config.guess buildaux/config.sub buildaux/depcomp \
+	buildaux/install-sh buildaux/ltmain.sh buildaux/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)

Index: othersrc/usr.bin/tnftp/configure
diff -u othersrc/usr.bin/tnftp/configure:1.61 othersrc/usr.bin/tnftp/configure:1.62
--- othersrc/usr.bin/tnftp/configure:1.61	Sun Apr  9 06:30:14 2023
+++ othersrc/usr.bin/tnftp/configure	Sun Apr  9 06:57:25 2023
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Revision: 1.45 .
+# From configure.ac Revision: 1.46 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for tnftp 20210827.
+# Generated by GNU Autoconf 2.69 for tnftp 20230409.
 #
 # Report bugs to .
 #
@@ -596,8 +596,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='tnftp'
 PACKAGE_TARNAME='tnftp'
-PACKAGE_VERSION='20210827'
-PACKAGE_STRING='tnftp 20210827'
+PACKAGE_VERSION='20230409'
+PACKAGE_STRING='tnftp 20230409'
 PACKAGE_BUGREPORT='lu...@netbsd.org'
 PACKAGE_URL=''
 
@@ -1341,7 +1341,7 @@ if test "$ac_init_help" = "long"; then
   # 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 tnftp 20210827 to adapt to many kinds of systems.
+\`configure' configures tnftp 20230409 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1411,7 +1411,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of tnftp 20210827:";;
+ short | recursive ) echo "Configuration of tnftp 20230409:";;
esac
   cat <<\_ACEOF
 
@@ -1537,7 +1537,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-tnftp configure 20210827
+tnftp configure 20230409
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2122,7 +2122,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by tnftp $as_me 20210827, which was
+It was created by tnftp $as_me 20230409, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4493,7 +4493,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tnftp'
- VERSION='20210827'
+ VERSION='20230409'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16748,7 +16748,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by tnftp $as_me 20210827, which was
+This file was extended by tnftp $as_me 20230409, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES= $CONFIG_FILES
@@ -16814,7 +16814,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/&/g'`"
 ac_cs_version="\\
-tnftp config.status 20210827
+tnftp config.status 20230409
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sun Apr  9 06:57:25 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp: Makefile.in configure

Log Message:
regen for tnftp 20230409


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 othersrc/usr.bin/tnftp/Makefile.in
cvs rdiff -u -r1.61 -r1.62 othersrc/usr.bin/tnftp/configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sun Apr  9 06:49:34 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp: ChangeLog NEWS configure.ac

Log Message:
tnftp 20230409 release

Changes since tnftp 20210827
* Validate SSL certificates by default, disabled with
  FTPSSLNOVERIFY=1 in the environment, or option sslnoverify.
* Add netrc processing to fetch-mode (URL on command line)
  to enable options and autologin via netrc.
* Handle relative URLs in fetch.
* Improve formatting of manual page.
* Update to NetBSD-ftp 20230225.


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 othersrc/usr.bin/tnftp/ChangeLog
cvs rdiff -u -r1.16 -r1.17 othersrc/usr.bin/tnftp/NEWS
cvs rdiff -u -r1.45 -r1.46 othersrc/usr.bin/tnftp/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/ChangeLog
diff -u othersrc/usr.bin/tnftp/ChangeLog:1.78 othersrc/usr.bin/tnftp/ChangeLog:1.79
--- othersrc/usr.bin/tnftp/ChangeLog:1.78	Fri Aug 27 02:29:39 2021
+++ othersrc/usr.bin/tnftp/ChangeLog	Sun Apr  9 06:49:34 2023
@@ -1,4 +1,24 @@
-$NetBSD: ChangeLog,v 1.78 2021/08/27 02:29:39 lukem Exp $
+$NetBSD: ChangeLog,v 1.79 2023/04/09 06:49:34 lukem Exp $
+
+Sun Apr  9 06:45:06 UTC 2023
+
+	* Release as "tnftp 20230409".
+
+	* Use better terminology.
+
+	* Merge NetBSD ftp from 20210826 to 20230226:
+		* Add option sslnoverify to control validation of SSL
+		  certificates.
+		* Add netrc processing to fetch-mode (URL on command line)
+		  to enable options and autologin via netrc.
+		* Fix SSL cleanup in some error paths.
+		* Support SSL certificate validation by default.
+		  FTPSSLNOVERIFY=1 in the environment to disable validation.
+		* Handle relative URLs.
+		* Improve ftp(1) markup.
+		* Fix -? in a more portable manner.
+		* Equivalent to "NetBSD-ftp 20230225" with documentation
+		  and portability fixes.
 
 Fri Aug 27 02:06:34 UTC 2021
 
@@ -53,7 +73,7 @@ Sun Jul  5 11:18:52 UTC 2020	lukem
 
 	* Release as "tnftp 20200705".
 
-	* Provide dummy source in libnetbsd to avoid linker errors
+	* Provide placeholder source in libnetbsd to avoid linker errors
 	  if no functions are replaced.
 
 	* Only replace glob if GLOB_BRACE and GLOB_TILDE aren't available.

Index: othersrc/usr.bin/tnftp/NEWS
diff -u othersrc/usr.bin/tnftp/NEWS:1.16 othersrc/usr.bin/tnftp/NEWS:1.17
--- othersrc/usr.bin/tnftp/NEWS:1.16	Fri Aug 27 02:29:39 2021
+++ othersrc/usr.bin/tnftp/NEWS	Sun Apr  9 06:49:34 2023
@@ -1,6 +1,20 @@
-$NetBSD: NEWS,v 1.16 2021/08/27 02:29:39 lukem Exp $
+$NetBSD: NEWS,v 1.17 2023/04/09 06:49:34 lukem Exp $
 
-This is tnftp version 20210827.
+This is tnftp version 20230409.
+
+Changes in tnftp 20210827 to 20230409:
+
+	Validate SSL certificates by default, disabled with
+	FTPSSLNOVERIFY=1 in the environment, or option sslnoverify.
+
+	Add netrc processing to fetch-mode (URL on command line)
+	to enable options and autologin via netrc.
+
+	Handle relative URLs in fetch.
+
+	Improve formatting of manual page.
+
+	Update to NetBSD-ftp 20230225.
 
 Changes in tnftp 20200705 to 20210827:
 

Index: othersrc/usr.bin/tnftp/configure.ac
diff -u othersrc/usr.bin/tnftp/configure.ac:1.45 othersrc/usr.bin/tnftp/configure.ac:1.46
--- othersrc/usr.bin/tnftp/configure.ac:1.45	Sun Apr  9 01:18:28 2023
+++ othersrc/usr.bin/tnftp/configure.ac	Sun Apr  9 06:49:34 2023
@@ -1,15 +1,15 @@
-#   $NetBSD: configure.ac,v 1.45 2023/04/09 01:18:28 lukem Exp $
+#   $NetBSD: configure.ac,v 1.46 2023/04/09 06:49:34 lukem Exp $
 #
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([tnftp], [20210827], [lu...@netbsd.org])
+AC_INIT([tnftp], [20230409], [lu...@netbsd.org])
 AC_PREREQ([2.69])
 
 AC_COPYRIGHT([
 Copyright (c) 1999-2023 The NetBSD Foundation, Inc.
 All rights reserved.
 ])
-AC_REVISION([$Revision: 1.45 $])
+AC_REVISION([$Revision: 1.46 $])
 
 AS_SHELL_SANITIZE()
 

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sun Apr  9 06:49:34 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp: ChangeLog NEWS configure.ac

Log Message:
tnftp 20230409 release

Changes since tnftp 20210827
* Validate SSL certificates by default, disabled with
  FTPSSLNOVERIFY=1 in the environment, or option sslnoverify.
* Add netrc processing to fetch-mode (URL on command line)
  to enable options and autologin via netrc.
* Handle relative URLs in fetch.
* Improve formatting of manual page.
* Update to NetBSD-ftp 20230225.


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 othersrc/usr.bin/tnftp/ChangeLog
cvs rdiff -u -r1.16 -r1.17 othersrc/usr.bin/tnftp/NEWS
cvs rdiff -u -r1.45 -r1.46 othersrc/usr.bin/tnftp/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sun Apr  9 06:30:14 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp: Makefile.in aclocal.m4 configure
tnftp_config.h.in

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 othersrc/usr.bin/tnftp/Makefile.in
cvs rdiff -u -r1.10 -r1.11 othersrc/usr.bin/tnftp/aclocal.m4 \
othersrc/usr.bin/tnftp/tnftp_config.h.in
cvs rdiff -u -r1.60 -r1.61 othersrc/usr.bin/tnftp/configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/Makefile.in
diff -u othersrc/usr.bin/tnftp/Makefile.in:1.14 othersrc/usr.bin/tnftp/Makefile.in:1.15
--- othersrc/usr.bin/tnftp/Makefile.in:1.14	Wed Aug 25 01:52:07 2021
+++ othersrc/usr.bin/tnftp/Makefile.in	Sun Apr  9 06:30:14 2023
@@ -172,8 +172,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in 
 	$(top_srcdir)/buildaux/ltmain.sh \
 	$(top_srcdir)/buildaux/missing COPYING ChangeLog INSTALL NEWS \
 	README THANKS buildaux/ar-lib buildaux/compile \
-	buildaux/config.guess buildaux/config.sub buildaux/depcomp \
-	buildaux/install-sh buildaux/ltmain.sh buildaux/missing
+	buildaux/config.guess buildaux/config.sub buildaux/install-sh \
+	buildaux/ltmain.sh buildaux/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)

Index: othersrc/usr.bin/tnftp/aclocal.m4
diff -u othersrc/usr.bin/tnftp/aclocal.m4:1.10 othersrc/usr.bin/tnftp/aclocal.m4:1.11
--- othersrc/usr.bin/tnftp/aclocal.m4:1.10	Wed Aug 25 01:04:38 2021
+++ othersrc/usr.bin/tnftp/aclocal.m4	Sun Apr  9 06:30:14 2023
@@ -20,6 +20,120 @@ You have another version of autoconf.  I
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
+# longlong.m4 serial 17
+dnl Copyright (C) 1999-2007, 2009-2016 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Paul Eggert.
+
+# Define HAVE_LONG_LONG_INT if 'long long int' works.
+# This fixes a bug in Autoconf 2.61, and can be faster
+# than what's in Autoconf 2.62 through 2.68.
+
+# Note: If the type 'long long int' exists but is only 32 bits large
+# (as on some very old compilers), HAVE_LONG_LONG_INT will not be
+# defined. In this case you can treat 'long long int' like 'long int'.
+
+AC_DEFUN([AC_TYPE_LONG_LONG_INT],
+[
+  AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
+  AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int],
+ [ac_cv_type_long_long_int=yes
+  if test "x${ac_cv_prog_cc_c99-no}" = xno; then
+ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int
+if test $ac_cv_type_long_long_int = yes; then
+  dnl Catch a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004.
+  dnl If cross compiling, assume the bug is not important, since
+  dnl nobody cross compiles for this platform as far as we know.
+  AC_RUN_IFELSE(
+[AC_LANG_PROGRAM(
+   [[@%:@include 
+ @%:@ifndef LLONG_MAX
+ @%:@ define HALF \
+  (1LL << (sizeof (long long int) * CHAR_BIT - 2))
+ @%:@ define LLONG_MAX (HALF - 1 + HALF)
+ @%:@endif]],
+   [[long long int n = 1;
+ int i;
+ for (i = 0; ; i++)
+   {
+ long long int m = n << i;
+ if (m >> i != n)
+   return 1;
+ if (LLONG_MAX / 2 < m)
+   break;
+   }
+ return 0;]])],
+[],
+[ac_cv_type_long_long_int=no],
+[:])
+fi
+  fi])
+  if test $ac_cv_type_long_long_int = yes; then
+AC_DEFINE([HAVE_LONG_LONG_INT], [1],
+  [Define to 1 if the system has the type 'long long int'.])
+  fi
+])
+
+# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.
+# This fixes a bug in Autoconf 2.61, and can be faster
+# than what's in Autoconf 2.62 through 2.68.
+
+# Note: If the type 'unsigned long long int' exists but is only 32 bits
+# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT
+# will not be defined. In this case you can treat 'unsigned long long int'
+# like 'unsigned long int'.
+
+AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],
+[
+  AC_CACHE_CHECK([for unsigned long long int],
+[ac_cv_type_unsigned_long_long_int],
+[ac_cv_type_unsigned_long_long_int=yes
+ if test "x${ac_cv_prog_cc_c99-no}" = xno; then
+   AC_LINK_IFELSE(
+ [_AC_TYPE_LONG_LONG_SNIPPET],
+ [],
+ [ac_cv_type_unsigned_long_long_int=no])
+ fi])
+  

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sun Apr  9 06:30:14 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp: Makefile.in aclocal.m4 configure
tnftp_config.h.in

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 othersrc/usr.bin/tnftp/Makefile.in
cvs rdiff -u -r1.10 -r1.11 othersrc/usr.bin/tnftp/aclocal.m4 \
othersrc/usr.bin/tnftp/tnftp_config.h.in
cvs rdiff -u -r1.60 -r1.61 othersrc/usr.bin/tnftp/configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp/libnetbsd

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sun Apr  9 06:23:20 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp/libnetbsd: libnetbsd.c

Log Message:
use better terminology


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 othersrc/usr.bin/tnftp/libnetbsd/libnetbsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/libnetbsd/libnetbsd.c
diff -u othersrc/usr.bin/tnftp/libnetbsd/libnetbsd.c:1.1 othersrc/usr.bin/tnftp/libnetbsd/libnetbsd.c:1.2
--- othersrc/usr.bin/tnftp/libnetbsd/libnetbsd.c:1.1	Sun Jul  5 11:11:10 2020
+++ othersrc/usr.bin/tnftp/libnetbsd/libnetbsd.c	Sun Apr  9 06:23:20 2023
@@ -1,3 +1,3 @@
-/* $NetBSD: libnetbsd.c,v 1.1 2020/07/05 11:11:10 lukem Exp $ */
+/* $NetBSD: libnetbsd.c,v 1.2 2023/04/09 06:23:20 lukem Exp $ */
 
-const char libnetbsd_dummy[] = "Ensure libnetbsd.la is not empty";
+const char libnetbsd_placeholder[] = "Ensure libnetbsd.la is not empty";

CVS commit: othersrc/usr.bin/tnftp/libnetbsd

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sun Apr  9 06:23:20 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp/libnetbsd: libnetbsd.c

Log Message:
use better terminology


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 othersrc/usr.bin/tnftp/libnetbsd/libnetbsd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp/src

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sun Apr  9 06:17:55 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp/src: ssl.c

Log Message:
ssl.c: sync from upstream 1.14

Simplify includes
Include "ftp_var.h" instead of various system headers and "extern.h"


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 othersrc/usr.bin/tnftp/src/ssl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/src/ssl.c
diff -u othersrc/usr.bin/tnftp/src/ssl.c:1.8 othersrc/usr.bin/tnftp/src/ssl.c:1.9
--- othersrc/usr.bin/tnftp/src/ssl.c:1.8	Sun Apr  9 00:56:07 2023
+++ othersrc/usr.bin/tnftp/src/ssl.c	Sun Apr  9 06:17:55 2023
@@ -1,5 +1,5 @@
-/*	$NetBSD: ssl.c,v 1.8 2023/04/09 00:56:07 lukem Exp $	*/
-/*	from	NetBSD: ssl.c,v 1.13 2023/02/25 12:07:25 mlelstv Exp	*/
+/*	$NetBSD: ssl.c,v 1.9 2023/04/09 06:17:55 lukem Exp $	*/
+/*	from	NetBSD: ssl.c,v 1.14 2023/04/09 06:10:03 lukem Exp	*/
 
 /*-
  * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
@@ -40,7 +40,7 @@
 
 #include 
 #ifndef lint
-__RCSID(" NetBSD: ssl.c,v 1.13 2023/02/25 12:07:25 mlelstv Exp  ");
+__RCSID(" NetBSD: ssl.c,v 1.14 2023/04/09 06:10:03 lukem Exp  ");
 #endif
 
 #include 
@@ -70,11 +70,7 @@ __RCSID(" NetBSD: ssl.c,v 1.13 2023/02/2
 #endif
 
 #include "ssl.h"
-
-#include 
-#include 
-#include 
-#include "extern.h"
+#include "ftp_var.h"
 
 extern int quit_time, verbose, ftp_debug;
 extern FILE *ttyout;

CVS commit: othersrc/usr.bin/tnftp/src

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sun Apr  9 06:17:55 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp/src: ssl.c

Log Message:
ssl.c: sync from upstream 1.14

Simplify includes
Include "ftp_var.h" instead of various system headers and "extern.h"


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 othersrc/usr.bin/tnftp/src/ssl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sun Apr  9 01:18:28 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp: COPYING configure.ac

Log Message:
copyright 2023


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 othersrc/usr.bin/tnftp/COPYING
cvs rdiff -u -r1.44 -r1.45 othersrc/usr.bin/tnftp/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/COPYING
diff -u othersrc/usr.bin/tnftp/COPYING:1.10 othersrc/usr.bin/tnftp/COPYING:1.11
--- othersrc/usr.bin/tnftp/COPYING:1.10	Sat Oct  9 04:26:37 2021
+++ othersrc/usr.bin/tnftp/COPYING	Sun Apr  9 01:18:28 2023
@@ -1,6 +1,6 @@
-$NetBSD: COPYING,v 1.10 2021/10/09 04:26:37 lukem Exp $
+$NetBSD: COPYING,v 1.11 2023/04/09 01:18:28 lukem Exp $
 
-Copyright (c) 2001-2021 The NetBSD Foundation, Inc.
+Copyright (c) 2001-2023 The NetBSD Foundation, Inc.
 All rights reserved.
 
 This code is derived from software contributed to The NetBSD Foundation

Index: othersrc/usr.bin/tnftp/configure.ac
diff -u othersrc/usr.bin/tnftp/configure.ac:1.44 othersrc/usr.bin/tnftp/configure.ac:1.45
--- othersrc/usr.bin/tnftp/configure.ac:1.44	Fri Aug 27 02:29:39 2021
+++ othersrc/usr.bin/tnftp/configure.ac	Sun Apr  9 01:18:28 2023
@@ -1,4 +1,4 @@
-#   $NetBSD: configure.ac,v 1.44 2021/08/27 02:29:39 lukem Exp $
+#   $NetBSD: configure.ac,v 1.45 2023/04/09 01:18:28 lukem Exp $
 #
 # Process this file with autoconf to produce a configure script.
 
@@ -6,10 +6,10 @@ AC_INIT([tnftp], [20210827], [lukem@NetB
 AC_PREREQ([2.69])
 
 AC_COPYRIGHT([
-Copyright (c) 1999-2021 The NetBSD Foundation, Inc.
+Copyright (c) 1999-2023 The NetBSD Foundation, Inc.
 All rights reserved.
 ])
-AC_REVISION([$Revision: 1.44 $])
+AC_REVISION([$Revision: 1.45 $])
 
 AS_SHELL_SANITIZE()
 

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sun Apr  9 01:18:28 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp: COPYING configure.ac

Log Message:
copyright 2023


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 othersrc/usr.bin/tnftp/COPYING
cvs rdiff -u -r1.44 -r1.45 othersrc/usr.bin/tnftp/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sun Apr  9 01:06:10 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp: THANKS

Log Message:
THANKS: add recent NetBSD committers


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 othersrc/usr.bin/tnftp/THANKS

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/THANKS
diff -u othersrc/usr.bin/tnftp/THANKS:1.8 othersrc/usr.bin/tnftp/THANKS:1.9
--- othersrc/usr.bin/tnftp/THANKS:1.8	Sun Jan 31 06:10:20 2016
+++ othersrc/usr.bin/tnftp/THANKS	Sun Apr  9 01:06:10 2023
@@ -6,6 +6,7 @@ Adam Sampson
 Amitai Schlair
 Anders Dinsen
 Anders Magnusson
+Andrius Varanavicius
 Arkadiusz Miskiewicz
 Brian Stark
 Chris G. Demetriou
@@ -44,9 +45,11 @@ Matthias Scheler
 Maxim Konovalov
 Maxime Henrion
 Michael L. Hitch
+Michael van Elst
 Mike Heffner
 NONAKA Kimihiro
 Onno van der Linden
+Roland Illig
 Ruslan Ermilov
 Ryoji Kanai
 Scott Aaron Bamford
@@ -57,6 +60,7 @@ Stoned Elipot
 TAMURA Kent
 Todd C. Miller
 Uwe Stuehler
+Valeriy E. Ushakov
 YAMANO Yuji
 Yar Tikhiy
 

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sun Apr  9 01:06:10 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp: THANKS

Log Message:
THANKS: add recent NetBSD committers


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 othersrc/usr.bin/tnftp/THANKS

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sun Apr  9 00:59:30 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp: todo

Log Message:
todo: move most entries to "Old items"


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 othersrc/usr.bin/tnftp/todo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sun Apr  9 00:59:30 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp: todo

Log Message:
todo: move most entries to "Old items"


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 othersrc/usr.bin/tnftp/todo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/todo
diff -u othersrc/usr.bin/tnftp/todo:1.15 othersrc/usr.bin/tnftp/todo:1.16
--- othersrc/usr.bin/tnftp/todo:1.15	Sun Jul  5 09:37:53 2020
+++ othersrc/usr.bin/tnftp/todo	Sun Apr  9 00:59:29 2023
@@ -1,17 +1,19 @@
-$NetBSD: todo,v 1.15 2020/07/05 09:37:53 lukem Exp $
+$NetBSD: todo,v 1.16 2023/04/09 00:59:29 lukem Exp $
 
 Current Items
 -
 
+Publish on http://freshcode.club
+
+Old Items
+-
+
 autoconf test for HAVE_DECL_GETADDRINFO if providing getaddrinfo() override.
 (required for UnixWare 7.1.1)
 
 Interix may need hack to fix detection of getpgrp() void args.
 (See pkgsrc/net/tnftp/files/src/progressbar.c 1.2)
 
-Old Items
--
-
 in configure, check for ansi c compiler and barf if it fails
 
 check if we need #defines for memcpy() et al

CVS commit: othersrc/usr.bin/tnftp/src

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sun Apr  9 00:56:07 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp/src: cmdtab.c extern.h fetch.c ftp.1 ftp_var.h
main.c ssl.c util.c version.h

Log Message:
Merge from tag NetBSD-20210826 to tag NetBSD-20230226


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 othersrc/usr.bin/tnftp/src/cmdtab.c
cvs rdiff -u -r1.14 -r1.15 othersrc/usr.bin/tnftp/src/extern.h
cvs rdiff -u -r1.26 -r1.27 othersrc/usr.bin/tnftp/src/fetch.c
cvs rdiff -u -r1.18 -r1.19 othersrc/usr.bin/tnftp/src/ftp.1
cvs rdiff -u -r1.13 -r1.14 othersrc/usr.bin/tnftp/src/ftp_var.h
cvs rdiff -u -r1.22 -r1.23 othersrc/usr.bin/tnftp/src/main.c
cvs rdiff -u -r1.7 -r1.8 othersrc/usr.bin/tnftp/src/ssl.c
cvs rdiff -u -r1.25 -r1.26 othersrc/usr.bin/tnftp/src/util.c
cvs rdiff -u -r1.10 -r1.11 othersrc/usr.bin/tnftp/src/version.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/src/cmdtab.c
diff -u othersrc/usr.bin/tnftp/src/cmdtab.c:1.12 othersrc/usr.bin/tnftp/src/cmdtab.c:1.13
--- othersrc/usr.bin/tnftp/src/cmdtab.c:1.12	Sun May  5 11:17:30 2013
+++ othersrc/usr.bin/tnftp/src/cmdtab.c	Sun Apr  9 00:56:07 2023
@@ -1,8 +1,8 @@
-/*	$NetBSD: cmdtab.c,v 1.12 2013/05/05 11:17:30 lukem Exp $	*/
-/*	from	NetBSD: cmdtab.c,v 1.52 2012/12/22 16:57:09 christos Exp	*/
+/*	$NetBSD: cmdtab.c,v 1.13 2023/04/09 00:56:07 lukem Exp $	*/
+/*	from	NetBSD: cmdtab.c,v 1.53 2023/02/25 12:07:25 mlelstv Exp	*/
 
 /*-
- * Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
+ * Copyright (c) 1996-2023 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -68,7 +68,7 @@
 #if 0
 static char sccsid[] = "@(#)cmdtab.c	8.4 (Berkeley) 10/9/94";
 #else
-__RCSID(" NetBSD: cmdtab.c,v 1.52 2012/12/22 16:57:09 christos Exp  ");
+__RCSID(" NetBSD: cmdtab.c,v 1.53 2023/02/25 12:07:25 mlelstv Exp  ");
 #endif
 #endif /* not lint */
 
@@ -303,13 +303,14 @@ struct cmd cmdtab[] = {
 };
 
 struct option optiontab[] = {
-	{ "anonpass",	NULL },
-	{ "ftp_proxy",	NULL },
-	{ "http_proxy",	NULL },
-	{ "https_proxy",NULL },
-	{ "no_proxy",	NULL },
-	{ "pager",	NULL },
-	{ "prompt",	NULL },
-	{ "rprompt",	NULL },
-	{ NULL,		NULL },
+	{ "anonpass",	   NULL },
+	{ "ftp_proxy",	   NULL },
+	{ "http_proxy",	   NULL },
+	{ "https_proxy",   NULL },
+	{ "no_proxy",	   NULL },
+	{ "pager",	   NULL },
+	{ "prompt",	   NULL },
+	{ "rprompt",	   NULL },
+	{ "sslnoverify"   ,NULL },
+	{ NULL,		   NULL },
 };

Index: othersrc/usr.bin/tnftp/src/extern.h
diff -u othersrc/usr.bin/tnftp/src/extern.h:1.14 othersrc/usr.bin/tnftp/src/extern.h:1.15
--- othersrc/usr.bin/tnftp/src/extern.h:1.14	Sat Jul  4 09:59:07 2020
+++ othersrc/usr.bin/tnftp/src/extern.h	Sun Apr  9 00:56:07 2023
@@ -1,8 +1,8 @@
-/*	$NetBSD: extern.h,v 1.14 2020/07/04 09:59:07 lukem Exp $	*/
-/*	from	NetBSD: extern.h,v 1.82 2019/06/22 23:40:53 christos Exp	*/
+/*	$NetBSD: extern.h,v 1.15 2023/04/09 00:56:07 lukem Exp $	*/
+/*	from	NetBSD: extern.h,v 1.83 2023/02/25 12:07:25 mlelstv Exp	*/
 
 /*-
- * Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
+ * Copyright (c) 1996-2023 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -244,6 +244,7 @@ void	user(int, char **);
 int	ftp_connect(int, const struct sockaddr *, socklen_t, int);
 int	ftp_listen(int, int);
 int	ftp_poll(struct pollfd *, int, int);
+int	ftp_truthy(const char *, const char *, int);
 #ifndef SMALL
 void   *ftp_malloc(size_t);
 StringList *ftp_sl_init(void);

Index: othersrc/usr.bin/tnftp/src/fetch.c
diff -u othersrc/usr.bin/tnftp/src/fetch.c:1.26 othersrc/usr.bin/tnftp/src/fetch.c:1.27
--- othersrc/usr.bin/tnftp/src/fetch.c:1.26	Fri Aug 27 01:38:49 2021
+++ othersrc/usr.bin/tnftp/src/fetch.c	Sun Apr  9 00:56:07 2023
@@ -1,5 +1,5 @@
-/*	$NetBSD: fetch.c,v 1.26 2021/08/27 01:38:49 lukem Exp $	*/
-/*	from	NetBSD: fetch.c,v 1.234 2021/08/01 15:29:30 andvar Exp	*/
+/*	$NetBSD: fetch.c,v 1.27 2023/04/09 00:56:07 lukem Exp $	*/
+/*	from	NetBSD: fetch.c,v 1.236 2023/02/25 12:07:25 mlelstv Exp	*/
 
 /*-
  * Copyright (c) 1997-2015 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
 
 #include 
 #ifndef lint
-__RCSID(" NetBSD: fetch.c,v 1.234 2021/08/01 15:29:30 andvar Exp  ");
+__RCSID(" NetBSD: fetch.c,v 1.236 2023/02/25 12:07:25 mlelstv Exp  ");
 #endif /* not lint */
 
 /*
@@ -113,12 +113,13 @@ __dead static void	timeouthttp(int);
 static int	auth_url(const char *, char **, const struct authinfo *);
 static void	base64_encode(const unsigned char *, size_t, unsigned char *);
 #endif
-static int	go_fetch(const char *);
+static int	go_fetch(const char *, struct urlinfo *);
 static int	fetch_ftp(const char *);
-static int	fetch_url(const char *, const char *, char *, char *);
+static int	fetch_url(const char *, const char *, char *, char *

CVS commit: othersrc/usr.bin/tnftp/src

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sun Apr  9 00:56:07 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp/src: cmdtab.c extern.h fetch.c ftp.1 ftp_var.h
main.c ssl.c util.c version.h

Log Message:
Merge from tag NetBSD-20210826 to tag NetBSD-20230226


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 othersrc/usr.bin/tnftp/src/cmdtab.c
cvs rdiff -u -r1.14 -r1.15 othersrc/usr.bin/tnftp/src/extern.h
cvs rdiff -u -r1.26 -r1.27 othersrc/usr.bin/tnftp/src/fetch.c
cvs rdiff -u -r1.18 -r1.19 othersrc/usr.bin/tnftp/src/ftp.1
cvs rdiff -u -r1.13 -r1.14 othersrc/usr.bin/tnftp/src/ftp_var.h
cvs rdiff -u -r1.22 -r1.23 othersrc/usr.bin/tnftp/src/main.c
cvs rdiff -u -r1.7 -r1.8 othersrc/usr.bin/tnftp/src/ssl.c
cvs rdiff -u -r1.25 -r1.26 othersrc/usr.bin/tnftp/src/util.c
cvs rdiff -u -r1.10 -r1.11 othersrc/usr.bin/tnftp/src/version.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sat Oct  9 04:26:37 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp: COPYING

Log Message:
COPYING: convert to 2 clause BSD license


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 othersrc/usr.bin/tnftp/COPYING

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Sat Oct  9 04:26:37 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp: COPYING

Log Message:
COPYING: convert to 2 clause BSD license


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 othersrc/usr.bin/tnftp/COPYING

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/COPYING
diff -u othersrc/usr.bin/tnftp/COPYING:1.9 othersrc/usr.bin/tnftp/COPYING:1.10
--- othersrc/usr.bin/tnftp/COPYING:1.9	Sun May 16 08:28:50 2021
+++ othersrc/usr.bin/tnftp/COPYING	Sat Oct  9 04:26:37 2021
@@ -1,4 +1,4 @@
-$NetBSD: COPYING,v 1.9 2021/05/16 08:28:50 lukem Exp $
+$NetBSD: COPYING,v 1.10 2021/10/09 04:26:37 lukem Exp $
 
 Copyright (c) 2001-2021 The NetBSD Foundation, Inc.
 All rights reserved.
@@ -14,13 +14,6 @@ are met:
 2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
-   This product includes software developed by the NetBSD
-   Foundation, Inc. and its contributors.
-4. Neither the name of The NetBSD Foundation nor the names of its
-   contributors may be used to endorse or promote products derived
-   from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Fri Aug 27 02:32:12 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp: configure

Log Message:
regen again - configure.ac rcsid updated


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 othersrc/usr.bin/tnftp/configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/configure
diff -u othersrc/usr.bin/tnftp/configure:1.59 othersrc/usr.bin/tnftp/configure:1.60
--- othersrc/usr.bin/tnftp/configure:1.59	Fri Aug 27 02:29:39 2021
+++ othersrc/usr.bin/tnftp/configure	Fri Aug 27 02:32:12 2021
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.43 .
+# From configure.ac Revision: 1.44 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69 for tnftp 20210827.
 #

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Fri Aug 27 02:32:12 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp: configure

Log Message:
regen again - configure.ac rcsid updated


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 othersrc/usr.bin/tnftp/configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Fri Aug 27 02:29:39 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp: ChangeLog NEWS configure configure.ac

Log Message:
tnftp 20210827 release

Changes since tnftp 20200705:
* Validate address in server's PASV and LPSV responses. Previously a
  hostile server could cause ftp to open a data connection elsewhere.
* Avoid intermittent crashes by fixing signal handler restoration.
* Fix intermittent failures in -q QUITTIME by not using restartable
  signals.
* Set SO_KEEPALIVE on control connection to attempt to avoid timeouts.
* Update to NetBSD-ftp 20210826.
* Improve configure tests.
* Improve manual page.
* Display usage to stdout with -?.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 othersrc/usr.bin/tnftp/ChangeLog
cvs rdiff -u -r1.15 -r1.16 othersrc/usr.bin/tnftp/NEWS
cvs rdiff -u -r1.58 -r1.59 othersrc/usr.bin/tnftp/configure
cvs rdiff -u -r1.43 -r1.44 othersrc/usr.bin/tnftp/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/ChangeLog
diff -u othersrc/usr.bin/tnftp/ChangeLog:1.77 othersrc/usr.bin/tnftp/ChangeLog:1.78
--- othersrc/usr.bin/tnftp/ChangeLog:1.77	Fri Aug 27 01:02:54 2021
+++ othersrc/usr.bin/tnftp/ChangeLog	Fri Aug 27 02:29:39 2021
@@ -1,5 +1,22 @@
-$NetBSD: ChangeLog,v 1.77 2021/08/27 01:02:54 lukem Exp $
+$NetBSD: ChangeLog,v 1.78 2021/08/27 02:29:39 lukem Exp $
 
+Fri Aug 27 02:06:34 UTC 2021
+
+	* Release as "tnftp 20210827".
+
+	* Always build ssl.c.
+
+	* Merge NetBSD ftp from 20210131 to 20210826:
+		* Use fetch_* instead of stdio to fix support with
+		  interruptable signals.
+		* Fix typos in comments.
+		* Manual page improvements. NetBSD PR bin/51883.
+		* Set SO_KEEPALIVE on control connection to attempt to
+		  avoid timeouts. NetBSD PR bin/56129.
+		* Validate address in server's PASV and LPSV responses.
+		  Previously a hostile server could cause ftp to open a
+		  data connection elsewhere.
+		* Remove unnecessary variable assignments.
 
 Wed Aug 25 01:48:47 UTC 2021
 

Index: othersrc/usr.bin/tnftp/NEWS
diff -u othersrc/usr.bin/tnftp/NEWS:1.15 othersrc/usr.bin/tnftp/NEWS:1.16
--- othersrc/usr.bin/tnftp/NEWS:1.15	Sun Jul  5 11:37:02 2020
+++ othersrc/usr.bin/tnftp/NEWS	Fri Aug 27 02:29:39 2021
@@ -1,6 +1,26 @@
-$NetBSD: NEWS,v 1.15 2020/07/05 11:37:02 lukem Exp $
+$NetBSD: NEWS,v 1.16 2021/08/27 02:29:39 lukem Exp $
 
-This is tnftp version 20200705.
+This is tnftp version 20210827.
+
+Changes in tnftp 20200705 to 20210827:
+
+	Validate address in server's PASV and LPSV responses. Previously a
+	hostile server could cause ftp to open a data connection elsewhere.
+
+	Avoid intermittent crashes by fixing signal handler restoration.
+
+	Fix intermittent failures in -q QUITTIME by not using restartable
+	signals.
+
+	Set SO_KEEPALIVE on control connection to attempt to avoid timeouts.
+
+	Update to NetBSD-ftp 20210826.
+
+	Improve configure tests.
+
+	Improve manual page.
+
+	Display usage to stdout with -?.
 
 Changes in tnftp 20151004 to 20200705:
 

Index: othersrc/usr.bin/tnftp/configure
diff -u othersrc/usr.bin/tnftp/configure:1.58 othersrc/usr.bin/tnftp/configure:1.59
--- othersrc/usr.bin/tnftp/configure:1.58	Wed Aug 25 01:52:07 2021
+++ othersrc/usr.bin/tnftp/configure	Fri Aug 27 02:29:39 2021
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Revision: 1.43 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for tnftp 20200705.
+# Generated by GNU Autoconf 2.69 for tnftp 20210827.
 #
 # Report bugs to .
 #
@@ -596,8 +596,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='tnftp'
 PACKAGE_TARNAME='tnftp'
-PACKAGE_VERSION='20200705'
-PACKAGE_STRING='tnftp 20200705'
+PACKAGE_VERSION='20210827'
+PACKAGE_STRING='tnftp 20210827'
 PACKAGE_BUGREPORT='lu...@netbsd.org'
 PACKAGE_URL=''
 
@@ -1341,7 +1341,7 @@ if test "$ac_init_help" = "long"; then
   # 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 tnftp 20200705 to adapt to many kinds of systems.
+\`configure' configures tnftp 20210827 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1411,7 +1411,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
- short | recursive ) echo "Configuration of tnftp 20200705:";;
+ short | recursive ) echo "Configuration of tnftp 20210827:";;
esac
   cat <<\_ACEOF
 
@@ -1537,7 +1537,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-tnftp configure 20200705
+tnftp configure 20210827
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2122,7 +2122,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Fri Aug 27 02:29:39 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp: ChangeLog NEWS configure configure.ac

Log Message:
tnftp 20210827 release

Changes since tnftp 20200705:
* Validate address in server's PASV and LPSV responses. Previously a
  hostile server could cause ftp to open a data connection elsewhere.
* Avoid intermittent crashes by fixing signal handler restoration.
* Fix intermittent failures in -q QUITTIME by not using restartable
  signals.
* Set SO_KEEPALIVE on control connection to attempt to avoid timeouts.
* Update to NetBSD-ftp 20210826.
* Improve configure tests.
* Improve manual page.
* Display usage to stdout with -?.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 othersrc/usr.bin/tnftp/ChangeLog
cvs rdiff -u -r1.15 -r1.16 othersrc/usr.bin/tnftp/NEWS
cvs rdiff -u -r1.58 -r1.59 othersrc/usr.bin/tnftp/configure
cvs rdiff -u -r1.43 -r1.44 othersrc/usr.bin/tnftp/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp/src

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Fri Aug 27 01:48:30 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp/src: Makefile.in

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 othersrc/usr.bin/tnftp/src/Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp/src

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Fri Aug 27 01:48:30 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp/src: Makefile.in

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 othersrc/usr.bin/tnftp/src/Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/src/Makefile.in
diff -u othersrc/usr.bin/tnftp/src/Makefile.in:1.18 othersrc/usr.bin/tnftp/src/Makefile.in:1.19
--- othersrc/usr.bin/tnftp/src/Makefile.in:1.18	Wed Aug 25 01:04:39 2021
+++ othersrc/usr.bin/tnftp/src/Makefile.in	Fri Aug 27 01:48:30 2021
@@ -97,12 +97,9 @@ bin_PROGRAMS = tnftp$(EXEEXT)
 
 @OPT_EDITCOMPLETE_TRUE@@WITH_LOCAL_LIBEDIT_FALSE@am__append_3 = -ledit
 @WITH_SSL_TRUE@am__append_4 = \
-@WITH_SSL_TRUE@	ssl.c
-
-@WITH_SSL_TRUE@am__append_5 = \
 @WITH_SSL_TRUE@	$(OPENSSL_INCLUDES)
 
-@WITH_SSL_TRUE@am__append_6 = \
+@WITH_SSL_TRUE@am__append_5 = \
 @WITH_SSL_TRUE@	$(OPENSSL_LDFLAGS) \
 @WITH_SSL_TRUE@	$(OPENSSL_LIBS)
 
@@ -124,14 +121,11 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
 PROGRAMS = $(bin_PROGRAMS)
-am__tnftp_SOURCES_DIST = cmds.c cmdtab.c complete.c domacro.c fetch.c \
-	ftp.c main.c progressbar.c ruserpass.c util.c ssl.c
-@WITH_SSL_TRUE@am__objects_1 = tnftp-ssl.$(OBJEXT)
 am_tnftp_OBJECTS = tnftp-cmds.$(OBJEXT) tnftp-cmdtab.$(OBJEXT) \
 	tnftp-complete.$(OBJEXT) tnftp-domacro.$(OBJEXT) \
 	tnftp-fetch.$(OBJEXT) tnftp-ftp.$(OBJEXT) tnftp-main.$(OBJEXT) \
 	tnftp-progressbar.$(OBJEXT) tnftp-ruserpass.$(OBJEXT) \
-	tnftp-util.$(OBJEXT) $(am__objects_1)
+	tnftp-ssl.$(OBJEXT) tnftp-util.$(OBJEXT)
 tnftp_OBJECTS = $(am_tnftp_OBJECTS)
 am__DEPENDENCIES_1 =
 @WITH_SSL_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \
@@ -184,7 +178,7 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V
 am__v_CCLD_0 = @echo "  CCLD" $@;
 am__v_CCLD_1 = 
 SOURCES = $(tnftp_SOURCES)
-DIST_SOURCES = $(am__tnftp_SOURCES_DIST)
+DIST_SOURCES = $(tnftp_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
 n|no|NO) false;; \
@@ -361,14 +355,25 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-tnftp_SOURCES = cmds.c cmdtab.c complete.c domacro.c fetch.c ftp.c \
-	main.c progressbar.c ruserpass.c util.c $(am__append_4)
+tnftp_SOURCES = \
+	cmds.c \
+	cmdtab.c \
+	complete.c \
+	domacro.c \
+	fetch.c \
+	ftp.c \
+	main.c \
+	progressbar.c \
+	ruserpass.c \
+	ssl.c \
+	util.c
+
 tnftp_CPPFLAGS = -DHAVE_TNFTPD_H=1 \
 	-D_DEFAULT_CONFDIR=\"${sysconfdir}\" -I$(srcdir) \
 	-I$(top_srcdir)/libnetbsd -I$(top_srcdir) -I$(top_builddir) \
-	$(am__append_1) $(am__append_5)
+	$(am__append_1) $(am__append_4)
 tnftp_LDADD = ../libnetbsd/libnetbsd.la $(am__append_2) \
-	$(am__append_3) $(am__append_6)
+	$(am__append_3) $(am__append_5)
 man1_MANS = \
 	tnftp.1
 
@@ -641,20 +646,6 @@ tnftp-ruserpass.obj: ruserpass.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tnftp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tnftp-ruserpass.obj `if test -f 'ruserpass.c'; then $(CYGPATH_W) 'ruserpass.c'; else $(CYGPATH_W) '$(srcdir)/ruserpass.c'; fi`
 
-tnftp-util.o: util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tnftp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tnftp-util.o -MD -MP -MF $(DEPDIR)/tnftp-util.Tpo -c -o tnftp-util.o `test -f 'util.c' || echo '$(srcdir)/'`util.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/tnftp-util.Tpo $(DEPDIR)/tnftp-util.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='util.c' object='tnftp-util.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tnftp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tnftp-util.o `test -f 'util.c' || echo '$(srcdir)/'`util.c
-
-tnftp-util.obj: util.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tnftp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tnftp-util.obj -MD -MP -MF $(DEPDIR)/tnftp-util.Tpo -c -o tnftp-util.obj `if test -f 'util.c'; then $(CYGPATH_W) 'util.c'; else $(CYGPATH_W) '$(srcdir)/util.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/tnftp-util.Tpo $(DEPDIR)/tnftp-util.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='util.c' object='tnftp-util.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tnftp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tnftp-util.obj `if test -f 'util

CVS commit: othersrc/usr.bin/tnftp/src

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Fri Aug 27 01:48:01 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp/src: Makefile.am ssl.c

Log Message:
Always build ssl.c even if !WITH_SSL


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 othersrc/usr.bin/tnftp/src/Makefile.am \
othersrc/usr.bin/tnftp/src/ssl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp/src

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Fri Aug 27 01:48:01 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp/src: Makefile.am ssl.c

Log Message:
Always build ssl.c even if !WITH_SSL


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 othersrc/usr.bin/tnftp/src/Makefile.am \
othersrc/usr.bin/tnftp/src/ssl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/src/Makefile.am
diff -u othersrc/usr.bin/tnftp/src/Makefile.am:1.6 othersrc/usr.bin/tnftp/src/Makefile.am:1.7
--- othersrc/usr.bin/tnftp/src/Makefile.am:1.6	Sun Apr 25 09:29:43 2021
+++ othersrc/usr.bin/tnftp/src/Makefile.am	Fri Aug 27 01:48:01 2021
@@ -1,4 +1,4 @@
-## $NetBSD: Makefile.am,v 1.6 2021/04/25 09:29:43 lukem Exp $
+## $NetBSD: Makefile.am,v 1.7 2021/08/27 01:48:01 lukem Exp $
 
 bin_PROGRAMS = tnftp
 
@@ -12,6 +12,7 @@ tnftp_SOURCES = \
 	main.c \
 	progressbar.c \
 	ruserpass.c \
+	ssl.c \
 	util.c
 
 tnftp_CPPFLAGS = \
@@ -40,9 +41,6 @@ endif	# !OPT_EDITCOMPLETE
 
 
 if WITH_SSL
-tnftp_SOURCES += \
-	ssl.c
-
 tnftp_CPPFLAGS += \
 	$(OPENSSL_INCLUDES)
 
Index: othersrc/usr.bin/tnftp/src/ssl.c
diff -u othersrc/usr.bin/tnftp/src/ssl.c:1.6 othersrc/usr.bin/tnftp/src/ssl.c:1.7
--- othersrc/usr.bin/tnftp/src/ssl.c:1.6	Fri Aug 27 01:38:49 2021
+++ othersrc/usr.bin/tnftp/src/ssl.c	Fri Aug 27 01:48:01 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ssl.c,v 1.6 2021/08/27 01:38:49 lukem Exp $	*/
+/*	$NetBSD: ssl.c,v 1.7 2021/08/27 01:48:01 lukem Exp $	*/
 /*	from	NetBSD: ssl.c,v 1.10 2021/06/03 10:23:33 lukem Exp	*/
 
 /*-
@@ -58,6 +58,8 @@ __RCSID(" NetBSD: ssl.c,v 1.10 2021/06/0
 #include 
 #include 
 
+#endif	/* tnftp */
+
 #ifdef WITH_SSL
 #include 
 #include 
@@ -66,8 +68,6 @@ __RCSID(" NetBSD: ssl.c,v 1.10 2021/06/0
 #include 
 #endif
 
-#endif	/* tnftp */
-
 #include "ssl.h"
 
 extern int quit_time, verbose, ftp_debug;

CVS commit: othersrc/usr.bin/tnftp/src

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Fri Aug 27 01:38:49 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp/src: fetch.c ftp.1 ftp.c ssl.c ssl.h util.c
version.h

Log Message:
Merge from NetBSD-2021-01-31 to NetBSD-20210826


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 othersrc/usr.bin/tnftp/src/fetch.c
cvs rdiff -u -r1.17 -r1.18 othersrc/usr.bin/tnftp/src/ftp.1
cvs rdiff -u -r1.23 -r1.24 othersrc/usr.bin/tnftp/src/ftp.c
cvs rdiff -u -r1.5 -r1.6 othersrc/usr.bin/tnftp/src/ssl.c
cvs rdiff -u -r1.4 -r1.5 othersrc/usr.bin/tnftp/src/ssl.h
cvs rdiff -u -r1.24 -r1.25 othersrc/usr.bin/tnftp/src/util.c
cvs rdiff -u -r1.9 -r1.10 othersrc/usr.bin/tnftp/src/version.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/src/fetch.c
diff -u othersrc/usr.bin/tnftp/src/fetch.c:1.25 othersrc/usr.bin/tnftp/src/fetch.c:1.26
--- othersrc/usr.bin/tnftp/src/fetch.c:1.25	Sun Apr 25 07:50:37 2021
+++ othersrc/usr.bin/tnftp/src/fetch.c	Fri Aug 27 01:38:49 2021
@@ -1,5 +1,5 @@
-/*	$NetBSD: fetch.c,v 1.25 2021/04/25 07:50:37 lukem Exp $	*/
-/*	from	NetBSD: fetch.c,v 1.232 2020/07/11 00:29:38 lukem Exp	*/
+/*	$NetBSD: fetch.c,v 1.26 2021/08/27 01:38:49 lukem Exp $	*/
+/*	from	NetBSD: fetch.c,v 1.234 2021/08/01 15:29:30 andvar Exp	*/
 
 /*-
  * Copyright (c) 1997-2015 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
 
 #include 
 #ifndef lint
-__RCSID(" NetBSD: fetch.c,v 1.232 2020/07/11 00:29:38 lukem Exp  ");
+__RCSID(" NetBSD: fetch.c,v 1.234 2021/08/01 15:29:30 andvar Exp  ");
 #endif /* not lint */
 
 /*
@@ -145,6 +145,43 @@ static int	redirect_loop;
 	((urltype) == HTTP_URL_T)
 #endif
 
+/**
+ * fwrite(3) replacement that just uses write(2). Many stdio implementations
+ * don't handle interrupts properly and corrupt the output. We are taking
+ * alarm interrupts because of the progress bar.
+ *
+ * Assumes `fp' is pristine with no prior I/O calls on it.
+ */
+static size_t
+maxwrite(const void *buf, size_t size, size_t nmemb, FILE *fp)
+{
+	const char *p = buf;
+	ssize_t nwr = 0;
+	ssize_t n;
+	int fd = fileno(fp);
+
+	size *= nmemb;	/* assume no overflow */
+
+	while (size > 0) {
+		if ((n = write(fd, p, size)) == -1) {
+			switch (errno) {
+			case EINTR:
+			case EAGAIN:
+#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
+			case EWOULDBLOCK:
+#endif
+continue;
+			default:
+return nwr;
+			}
+		}
+		p += n;
+		nwr += n;
+		size -= n;
+	}
+	return nwr;
+}
+
 /*
  * Determine if token is the next word in buf (case insensitive).
  * If so, advance buf past the token and any trailing LWS, and
@@ -1657,7 +1694,7 @@ fetch_url(const char *url, const char *p
 }
 bytes += flen;
 bufrem -= flen;
-if (fwrite(xferbuf, sizeof(char), flen, fout)
+if (maxwrite(xferbuf, sizeof(char), flen, fout)
 != flen) {
 	warn("Writing `%s'", savefile);
 	goto cleanup_fetch_url;
@@ -2215,7 +2252,7 @@ go_fetch(const char *url)
 	/*
 	 * Try FTP URL-style and host:file arguments next.
 	 * If ftpproxy is set with an FTP URL, use fetch_url()
-	 * Othewise, use fetch_ftp().
+	 * Otherwise, use fetch_ftp().
 	 */
 	proxyenv = getoptionvalue("ftp_proxy");
 	if (!EMPTYSTRING(proxyenv) && STRNEQUAL(url, FTP_URL))

Index: othersrc/usr.bin/tnftp/src/ftp.1
diff -u othersrc/usr.bin/tnftp/src/ftp.1:1.17 othersrc/usr.bin/tnftp/src/ftp.1:1.18
--- othersrc/usr.bin/tnftp/src/ftp.1:1.17	Sun Apr 25 07:50:37 2021
+++ othersrc/usr.bin/tnftp/src/ftp.1	Fri Aug 27 01:38:49 2021
@@ -1,5 +1,5 @@
-.\" 	$NetBSD: ftp.1,v 1.17 2021/04/25 07:50:37 lukem Exp $
-.\" 	from	NetBSD: ftp.1,v 1.144 2021/01/31 08:59:40 lukem Exp
+.\" 	$NetBSD: ftp.1,v 1.18 2021/08/27 01:38:49 lukem Exp $
+.\" 	from	NetBSD: ftp.1,v 1.146 2021/04/25 09:09:55 lukem Exp
 .\"
 .\" Copyright (c) 1996-2021 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -58,7 +58,7 @@
 .\"
 .\"	@(#)ftp.1	8.3 (Berkeley) 10/9/94
 .\"
-.Dd January 31, 2021
+.Dd April 25, 2021
 .Dt FTP 1
 .Os
 .Sh NAME
@@ -185,10 +185,13 @@ Forces
 .Nm
 to only use IPv6 addresses.
 .It Fl A
-Force active mode ftp.
+Force active mode
+.Tn FTP .
 By default,
 .Nm
-will try to use passive mode ftp and fall back to active mode
+will try to use passive mode
+.Tn FTP
+and fall back to active mode
 if passive is not supported by the server.
 This option causes
 .Nm
@@ -301,7 +304,9 @@ Upload files on the command line to
 .Ar url
 where
 .Ar url
-is one of the ftp URL types as supported by auto-fetch
+is one of the
+.Sq Li ftp://
+URL types as supported by auto-fetch
 (with an optional target filename for single file uploads), and
 .Ar file
 is one or more local files to be uploaded.
@@ -543,7 +548,9 @@ A synonym for
 .Ic open .
 .It Ic gate Op Ar host Op Ar port
 Toggle gate-ftp mode, which used to connect through the
-TIS FWTK and Gauntlet ftp proxies.
+TIS FWTK and Gauntlet
+.Tn FTP
+proxies.
 This will not be permitted if the gate-ftp serve

CVS commit: othersrc/usr.bin/tnftp/src

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Fri Aug 27 01:38:49 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp/src: fetch.c ftp.1 ftp.c ssl.c ssl.h util.c
version.h

Log Message:
Merge from NetBSD-2021-01-31 to NetBSD-20210826


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 othersrc/usr.bin/tnftp/src/fetch.c
cvs rdiff -u -r1.17 -r1.18 othersrc/usr.bin/tnftp/src/ftp.1
cvs rdiff -u -r1.23 -r1.24 othersrc/usr.bin/tnftp/src/ftp.c
cvs rdiff -u -r1.5 -r1.6 othersrc/usr.bin/tnftp/src/ssl.c
cvs rdiff -u -r1.4 -r1.5 othersrc/usr.bin/tnftp/src/ssl.h
cvs rdiff -u -r1.24 -r1.25 othersrc/usr.bin/tnftp/src/util.c
cvs rdiff -u -r1.9 -r1.10 othersrc/usr.bin/tnftp/src/version.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Fri Aug 27 01:02:54 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp: ChangeLog

Log Message:
ChangeLog: recent additions


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 othersrc/usr.bin/tnftp/ChangeLog

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/ChangeLog
diff -u othersrc/usr.bin/tnftp/ChangeLog:1.76 othersrc/usr.bin/tnftp/ChangeLog:1.77
--- othersrc/usr.bin/tnftp/ChangeLog:1.76	Sun May 16 08:28:01 2021
+++ othersrc/usr.bin/tnftp/ChangeLog	Fri Aug 27 01:02:54 2021
@@ -1,6 +1,13 @@
-$NetBSD: ChangeLog,v 1.76 2021/05/16 08:28:01 lukem Exp $
+$NetBSD: ChangeLog,v 1.77 2021/08/27 01:02:54 lukem Exp $
 
 
+Wed Aug 25 01:48:47 UTC 2021
+
+	* configure:
+		* Update to automake 1.16.1.
+		* Enable AC_USE_SYSTEM_EXTENSIONS().
+		* Use --option-name in feature display.
+
 Sun May 16 08:25:55 UTC 2021	lukem
 
 	* Update INSTALL notes to reflect current configure.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Fri Aug 27 01:02:54 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp: ChangeLog

Log Message:
ChangeLog: recent additions


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 othersrc/usr.bin/tnftp/ChangeLog

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp/buildaux

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Thu Aug 26 00:32:36 UTC 2021

Added Files:
othersrc/usr.bin/tnftp/buildaux: ar-lib compile

Log Message:
add files missed in previous regen


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 othersrc/usr.bin/tnftp/buildaux/ar-lib \
othersrc/usr.bin/tnftp/buildaux/compile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: othersrc/usr.bin/tnftp/buildaux/ar-lib
diff -u /dev/null othersrc/usr.bin/tnftp/buildaux/ar-lib:1.1
--- /dev/null	Thu Aug 26 00:32:36 2021
+++ othersrc/usr.bin/tnftp/buildaux/ar-lib	Thu Aug 26 00:32:35 2021
@@ -0,0 +1,270 @@
+#! /bin/sh
+# Wrapper for Microsoft lib.exe
+
+me=ar-lib
+scriptversion=2012-03-01.08; # UTC
+
+# Copyright (C) 2010-2018 Free Software Foundation, Inc.
+# Written by Peter Rosin .
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to  or send patches to
+# .
+
+
+# func_error message
+func_error ()
+{
+  echo "$me: $1" 1>&2
+  exit 1
+}
+
+file_conv=
+
+# func_file_conv build_file
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+/ | /[!/]*) # absolute file, and not a UNC file
+  if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	file_conv=mingw
+	;;
+	  CYGWIN*)
+	file_conv=cygwin
+	;;
+	  *)
+	file_conv=wine
+	;;
+	esac
+  fi
+  case $file_conv in
+	mingw)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+  esac
+  ;;
+  esac
+}
+
+# func_at_file at_file operation archive
+# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE
+# for each of them.
+# When interpreting the content of the @FILE, do NOT use func_file_conv,
+# since the user would need to supply preconverted file names to
+# binutils ar, at least for MinGW.
+func_at_file ()
+{
+  operation=$2
+  archive=$3
+  at_file_contents=`cat "$1"`
+  eval set x "$at_file_contents"
+  shift
+
+  for member
+  do
+$AR -NOLOGO $operation:"$member" "$archive" || exit $?
+  done
+}
+
+case $1 in
+  '')
+ func_error "no command.  Try '$0 --help' for more information."
+ ;;
+  -h | --h*)
+cat <.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to  or send patches to
+# .
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+/ | /[!/]*) # absolute file, and not a UNC file
+  if test -z "$file_conv"; then
+	# lazily determine how t

CVS commit: othersrc/usr.bin/tnftp/buildaux

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Thu Aug 26 00:32:36 UTC 2021

Added Files:
othersrc/usr.bin/tnftp/buildaux: ar-lib compile

Log Message:
add files missed in previous regen


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 othersrc/usr.bin/tnftp/buildaux/ar-lib \
othersrc/usr.bin/tnftp/buildaux/compile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Wed Aug 25 01:52:07 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp: Makefile.in configure tnftp_config.h.in

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 othersrc/usr.bin/tnftp/Makefile.in
cvs rdiff -u -r1.57 -r1.58 othersrc/usr.bin/tnftp/configure
cvs rdiff -u -r1.9 -r1.10 othersrc/usr.bin/tnftp/tnftp_config.h.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Wed Aug 25 01:48:47 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp: configure.ac

Log Message:
configure: use --option-name in feature display

Use the appropriate option name in the feature display.
Sort the options.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 othersrc/usr.bin/tnftp/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/configure.ac
diff -u othersrc/usr.bin/tnftp/configure.ac:1.42 othersrc/usr.bin/tnftp/configure.ac:1.43
--- othersrc/usr.bin/tnftp/configure.ac:1.42	Wed Aug 25 01:24:10 2021
+++ othersrc/usr.bin/tnftp/configure.ac	Wed Aug 25 01:48:47 2021
@@ -1,4 +1,4 @@
-#   $NetBSD: configure.ac,v 1.42 2021/08/25 01:24:10 lukem Exp $
+#   $NetBSD: configure.ac,v 1.43 2021/08/25 01:48:47 lukem Exp $
 #
 # Process this file with autoconf to produce a configure script.
 
@@ -9,7 +9,7 @@ AC_COPYRIGHT([
 Copyright (c) 1999-2021 The NetBSD Foundation, Inc.
 All rights reserved.
 ])
-AC_REVISION([$Revision: 1.42 $])
+AC_REVISION([$Revision: 1.43 $])
 
 AS_SHELL_SANITIZE()
 
@@ -497,9 +497,9 @@ AC_OUTPUT()
 AC_MSG_NOTICE([ === Configuration results ===])
 AC_MSG_NOTICE([Package:   $PACKAGE_STRING])
 AC_MSG_NOTICE([Prefix:$prefix])
-AC_MSG_NOTICE([Command-line editing:  $opt_editcomplete])
-AC_MSG_NOTICE([Local libedit: $with_local_libedit])
-AC_MSG_NOTICE([IPv6 support:  $opt_ipv6])
-AC_MSG_NOTICE([SOCKS5 proxy support:  $with_socks])
-AC_MSG_NOTICE([SSL:   $with_ssl])
+AC_MSG_NOTICE([--enable-editcomplete  $opt_editcomplete])
+AC_MSG_NOTICE([--enable-ipv6  $opt_ipv6])
+AC_MSG_NOTICE([--enable-ssl   $with_ssl])
+AC_MSG_NOTICE([--with-local-libedit   $with_local_libedit])
+AC_MSG_NOTICE([--with-socks   $with_socks])
 AC_MSG_NOTICE([ =])

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Wed Aug 25 01:48:47 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp: configure.ac

Log Message:
configure: use --option-name in feature display

Use the appropriate option name in the feature display.
Sort the options.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 othersrc/usr.bin/tnftp/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Wed Aug 25 01:24:10 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp: configure.ac

Log Message:
configure: enable AC_USE_SYSTEM_EXTENSIONS()

We use various POSIX extensions, so enable them.
This reduces compile warnings on some platforms (e.g. RHEL 8).


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 othersrc/usr.bin/tnftp/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/configure.ac
diff -u othersrc/usr.bin/tnftp/configure.ac:1.41 othersrc/usr.bin/tnftp/configure.ac:1.42
--- othersrc/usr.bin/tnftp/configure.ac:1.41	Wed Aug 25 00:58:53 2021
+++ othersrc/usr.bin/tnftp/configure.ac	Wed Aug 25 01:24:10 2021
@@ -1,4 +1,4 @@
-#   $NetBSD: configure.ac,v 1.41 2021/08/25 00:58:53 lukem Exp $
+#   $NetBSD: configure.ac,v 1.42 2021/08/25 01:24:10 lukem Exp $
 #
 # Process this file with autoconf to produce a configure script.
 
@@ -9,7 +9,7 @@ AC_COPYRIGHT([
 Copyright (c) 1999-2021 The NetBSD Foundation, Inc.
 All rights reserved.
 ])
-AC_REVISION([$Revision: 1.41 $])
+AC_REVISION([$Revision: 1.42 $])
 
 AS_SHELL_SANITIZE()
 
@@ -19,6 +19,8 @@ AC_CONFIG_MACRO_DIR([buildaux])
 AC_CONFIG_HEADERS([tnftp_config.h])
 AC_CONFIG_LIBOBJ_DIR([libnetbsd])
 
+AC_USE_SYSTEM_EXTENSIONS()
+
 AM_INIT_AUTOMAKE([-Wall -Werror foreign nostdinc silent-rules])
 AM_MAINTAINER_MODE()
 

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Wed Aug 25 01:24:10 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp: configure.ac

Log Message:
configure: enable AC_USE_SYSTEM_EXTENSIONS()

We use various POSIX extensions, so enable them.
This reduces compile warnings on some platforms (e.g. RHEL 8).


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 othersrc/usr.bin/tnftp/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Wed Aug 25 01:04:40 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp: Makefile.in aclocal.m4 configure
tnftp_config.h.in
othersrc/usr.bin/tnftp/buildaux: config.guess config.sub depcomp
install-sh libtool.m4 ltmain.sh ltoptions.m4 ltsugar.m4
ltversion.m4 lt~obsolete.m4 missing
othersrc/usr.bin/tnftp/libedit: Makefile.in
othersrc/usr.bin/tnftp/libnetbsd: Makefile.in
othersrc/usr.bin/tnftp/src: Makefile.in

Log Message:
regen with automake 1.16.1, libtool 2.4.6


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 othersrc/usr.bin/tnftp/Makefile.in
cvs rdiff -u -r1.9 -r1.10 othersrc/usr.bin/tnftp/aclocal.m4
cvs rdiff -u -r1.56 -r1.57 othersrc/usr.bin/tnftp/configure
cvs rdiff -u -r1.8 -r1.9 othersrc/usr.bin/tnftp/tnftp_config.h.in
cvs rdiff -u -r1.3 -r1.4 othersrc/usr.bin/tnftp/buildaux/config.guess \
othersrc/usr.bin/tnftp/buildaux/config.sub
cvs rdiff -u -r1.2 -r1.3 othersrc/usr.bin/tnftp/buildaux/depcomp \
othersrc/usr.bin/tnftp/buildaux/ltmain.sh \
othersrc/usr.bin/tnftp/buildaux/missing
cvs rdiff -u -r1.4 -r1.5 othersrc/usr.bin/tnftp/buildaux/install-sh
cvs rdiff -u -r1.1 -r1.2 othersrc/usr.bin/tnftp/buildaux/libtool.m4 \
othersrc/usr.bin/tnftp/buildaux/ltoptions.m4 \
othersrc/usr.bin/tnftp/buildaux/ltsugar.m4 \
othersrc/usr.bin/tnftp/buildaux/ltversion.m4 \
othersrc/usr.bin/tnftp/buildaux/lt~obsolete.m4
cvs rdiff -u -r1.12 -r1.13 othersrc/usr.bin/tnftp/libedit/Makefile.in
cvs rdiff -u -r1.13 -r1.14 othersrc/usr.bin/tnftp/libnetbsd/Makefile.in
cvs rdiff -u -r1.17 -r1.18 othersrc/usr.bin/tnftp/src/Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffs are larger than 1MB and have been omitted

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Wed Aug 25 01:04:40 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp: Makefile.in aclocal.m4 configure
tnftp_config.h.in
othersrc/usr.bin/tnftp/buildaux: config.guess config.sub depcomp
install-sh libtool.m4 ltmain.sh ltoptions.m4 ltsugar.m4
ltversion.m4 lt~obsolete.m4 missing
othersrc/usr.bin/tnftp/libedit: Makefile.in
othersrc/usr.bin/tnftp/libnetbsd: Makefile.in
othersrc/usr.bin/tnftp/src: Makefile.in

Log Message:
regen with automake 1.16.1, libtool 2.4.6


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 othersrc/usr.bin/tnftp/Makefile.in
cvs rdiff -u -r1.9 -r1.10 othersrc/usr.bin/tnftp/aclocal.m4
cvs rdiff -u -r1.56 -r1.57 othersrc/usr.bin/tnftp/configure
cvs rdiff -u -r1.8 -r1.9 othersrc/usr.bin/tnftp/tnftp_config.h.in
cvs rdiff -u -r1.3 -r1.4 othersrc/usr.bin/tnftp/buildaux/config.guess \
othersrc/usr.bin/tnftp/buildaux/config.sub
cvs rdiff -u -r1.2 -r1.3 othersrc/usr.bin/tnftp/buildaux/depcomp \
othersrc/usr.bin/tnftp/buildaux/ltmain.sh \
othersrc/usr.bin/tnftp/buildaux/missing
cvs rdiff -u -r1.4 -r1.5 othersrc/usr.bin/tnftp/buildaux/install-sh
cvs rdiff -u -r1.1 -r1.2 othersrc/usr.bin/tnftp/buildaux/libtool.m4 \
othersrc/usr.bin/tnftp/buildaux/ltoptions.m4 \
othersrc/usr.bin/tnftp/buildaux/ltsugar.m4 \
othersrc/usr.bin/tnftp/buildaux/ltversion.m4 \
othersrc/usr.bin/tnftp/buildaux/lt~obsolete.m4
cvs rdiff -u -r1.12 -r1.13 othersrc/usr.bin/tnftp/libedit/Makefile.in
cvs rdiff -u -r1.13 -r1.14 othersrc/usr.bin/tnftp/libnetbsd/Makefile.in
cvs rdiff -u -r1.17 -r1.18 othersrc/usr.bin/tnftp/src/Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp/libnetbsd

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Wed Aug 25 00:59:48 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp/libnetbsd: Makefile.am

Log Message:
libnetbsd: use AM_CPPFLAGS not CPPFLAGS

Use AM_CPPFLAGS because CPPFLAGS is for user override


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 othersrc/usr.bin/tnftp/libnetbsd/Makefile.am

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/libnetbsd/Makefile.am
diff -u othersrc/usr.bin/tnftp/libnetbsd/Makefile.am:1.3 othersrc/usr.bin/tnftp/libnetbsd/Makefile.am:1.4
--- othersrc/usr.bin/tnftp/libnetbsd/Makefile.am:1.3	Sun Jul  5 11:11:10 2020
+++ othersrc/usr.bin/tnftp/libnetbsd/Makefile.am	Wed Aug 25 00:59:48 2021
@@ -1,10 +1,10 @@
-## $NetBSD: Makefile.am,v 1.3 2020/07/05 11:11:10 lukem Exp $
+## $NetBSD: Makefile.am,v 1.4 2021/08/25 00:59:48 lukem Exp $
 
 noinst_LTLIBRARIES = libnetbsd.la
 
 libnetbsd_la_SOURCES = libnetbsd.c
 
-CPPFLAGS = \
+AM_CPPFLAGS = \
 	-I$(srcdir) \
 	-I$(top_srcdir) \
 	-I$(top_builddir)

CVS commit: othersrc/usr.bin/tnftp/libnetbsd

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Wed Aug 25 00:59:48 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp/libnetbsd: Makefile.am

Log Message:
libnetbsd: use AM_CPPFLAGS not CPPFLAGS

Use AM_CPPFLAGS because CPPFLAGS is for user override


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 othersrc/usr.bin/tnftp/libnetbsd/Makefile.am

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Wed Aug 25 00:58:53 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp: configure.ac

Log Message:
configure: add AM_PROG_AR()

required by newer automake


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 othersrc/usr.bin/tnftp/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/configure.ac
diff -u othersrc/usr.bin/tnftp/configure.ac:1.40 othersrc/usr.bin/tnftp/configure.ac:1.41
--- othersrc/usr.bin/tnftp/configure.ac:1.40	Sun Apr 25 09:40:34 2021
+++ othersrc/usr.bin/tnftp/configure.ac	Wed Aug 25 00:58:53 2021
@@ -1,4 +1,4 @@
-#   $NetBSD: configure.ac,v 1.40 2021/04/25 09:40:34 lukem Exp $
+#   $NetBSD: configure.ac,v 1.41 2021/08/25 00:58:53 lukem Exp $
 #
 # Process this file with autoconf to produce a configure script.
 
@@ -9,7 +9,7 @@ AC_COPYRIGHT([
 Copyright (c) 1999-2021 The NetBSD Foundation, Inc.
 All rights reserved.
 ])
-AC_REVISION([$Revision: 1.40 $])
+AC_REVISION([$Revision: 1.41 $])
 
 AS_SHELL_SANITIZE()
 
@@ -89,6 +89,7 @@ AH_TEMPLATE([WITH_SSL],
 #
 AC_PROG_CC()
 AC_PROG_AWK()
+AM_PROG_AR()
 AC_PROG_LIBTOOL()
 
 #

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Wed Aug 25 00:58:53 UTC 2021

Modified Files:
othersrc/usr.bin/tnftp: configure.ac

Log Message:
configure: add AM_PROG_AR()

required by newer automake


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 othersrc/usr.bin/tnftp/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Re: CVS commit: othersrc/usr.bin/tnftp

[Christos Zoulas]

In article <20200707023354.gv12...@mewburn.net>,
Luke Mewburn   wrote:
>On 20-07-05 22:06, Christos Zoulas wrote:
>  | In article <20200705105511.91226f...@cvs.netbsd.org>,
>  | Luke Mewburn  wrote:
>  | >-=-=-=-=-=-
>  | >
>  | >Module Name:  othersrc
>  | >Committed By: lukem
>  | >Date: Sun Jul  5 10:55:11 UTC 2020
>  | >
>  | >Modified Files:
>  | >  othersrc/usr.bin/tnftp: ChangeLog NEWS configure.ac
>  | >
>  | >Log Message:
>  | >Only replace glob if GLOB_BRACE and GLOB_TILDE aren't available.
>  | 
>  | More importantly for ftp GLOB_LIMIT.
>
>usr.bin/tnftp (from ftp) does not use GLOB_LIMIT, so I don't need to
>check if the system glob() supports it.
>
>libexec/tnftpd (from ftpd) does use GLOB_LIMIT, but that build hasn't
>yet been modified to check if the system glob() is sufficient. I'll do
>that sometime, but I will ensure that configure check also checks for
>GLOB_LIMIT.

Thanks, I confused tnftp and tnftpd.

christos

Re: CVS commit: othersrc/usr.bin/tnftp

[Christos Zoulas]

In article <20200707021514.gu12...@mewburn.net>,
Luke Mewburn   wrote:
>On 20-07-05 22:07, Christos Zoulas wrote:
>  | In article <20200705105548.f0265f...@cvs.netbsd.org>,
>  | Luke Mewburn  wrote:
>  | >-=-=-=-=-=-
>  | >
>  | >Module Name:  othersrc
>  | >Committed By: lukem
>  | >Date: Sun Jul  5 10:55:48 UTC 2020
>  | >
>  | >Modified Files:
>  | >  othersrc/usr.bin/tnftp: configure tnftp_config.h.in
>  | 
>  | And GLOB_NOCHECK.
>
>AFAICT, GLOB_NOCHECK is "standard POSIX" and not a BSD/GNU extension,
>so I figured I didn't need to check for it.
>Do you know of systems that provide  and glob() but
>don't support GLOB_NOCHECK() ?

No, I don't but it is simple enough to |GLOB_NOCHECK in the test.
I just listed all the flags tnftp uses I think.

christos

Re: CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

On 20-07-05 22:06, Christos Zoulas wrote:
  | In article <20200705105511.91226f...@cvs.netbsd.org>,
  | Luke Mewburn  wrote:
  | >-=-=-=-=-=-
  | >
  | >Module Name:   othersrc
  | >Committed By:  lukem
  | >Date:  Sun Jul  5 10:55:11 UTC 2020
  | >
  | >Modified Files:
  | >   othersrc/usr.bin/tnftp: ChangeLog NEWS configure.ac
  | >
  | >Log Message:
  | >Only replace glob if GLOB_BRACE and GLOB_TILDE aren't available.
  | 
  | More importantly for ftp GLOB_LIMIT.

usr.bin/tnftp (from ftp) does not use GLOB_LIMIT, so I don't need to
check if the system glob() supports it.

libexec/tnftpd (from ftpd) does use GLOB_LIMIT, but that build hasn't
yet been modified to check if the system glob() is sufficient. I'll do
that sometime, but I will ensure that configure check also checks for
GLOB_LIMIT.

Luke.

Re: CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

On 20-07-05 22:07, Christos Zoulas wrote:
  | In article <20200705105548.f0265f...@cvs.netbsd.org>,
  | Luke Mewburn  wrote:
  | >-=-=-=-=-=-
  | >
  | >Module Name:   othersrc
  | >Committed By:  lukem
  | >Date:  Sun Jul  5 10:55:48 UTC 2020
  | >
  | >Modified Files:
  | >   othersrc/usr.bin/tnftp: configure tnftp_config.h.in
  | 
  | And GLOB_NOCHECK.

AFAICT, GLOB_NOCHECK is "standard POSIX" and not a BSD/GNU extension,
so I figured I didn't need to check for it.
Do you know of systems that provide  and glob() but
don't support GLOB_NOCHECK() ?

Re: CVS commit: othersrc/usr.bin/tnftp

[Christos Zoulas]

In article <20200705105548.f0265f...@cvs.netbsd.org>,
Luke Mewburn  wrote:
>-=-=-=-=-=-
>
>Module Name:   othersrc
>Committed By:  lukem
>Date:  Sun Jul  5 10:55:48 UTC 2020
>
>Modified Files:
>   othersrc/usr.bin/tnftp: configure tnftp_config.h.in

And GLOB_NOCHECK.

christos

Re: CVS commit: othersrc/usr.bin/tnftp

[Christos Zoulas]

In article <20200705105511.91226f...@cvs.netbsd.org>,
Luke Mewburn  wrote:
>-=-=-=-=-=-
>
>Module Name:   othersrc
>Committed By:  lukem
>Date:  Sun Jul  5 10:55:11 UTC 2020
>
>Modified Files:
>   othersrc/usr.bin/tnftp: ChangeLog NEWS configure.ac
>
>Log Message:
>Only replace glob if GLOB_BRACE and GLOB_TILDE aren't available.

More importantly for ftp GLOB_LIMIT.

christos

Re: CVS commit: othersrc/usr.bin/tnftp/libnetbsd

[Christos Zoulas]

On Mar 21, 10:45am, lu...@netbsd.org (Luke Mewburn) wrote:
-- Subject: Re: CVS commit: othersrc/usr.bin/tnftp/libnetbsd

| Done.
| 

THX!

christos

Re: CVS commit: othersrc/usr.bin/tnftp/libnetbsd

[Luke Mewburn]

On Wed, Mar 20, 2013 at 01:21:33PM +, Christos Zoulas wrote:
  | >* Use "unsigned char" instead of "u_char" (reinstate part of rev 1.7)
  | 
  | Please change those in libc, so that it does not happen again:
  | (u_foo).

Done.

cheers,
Luke.


pgpPl0c_fjRpd.pgp
Description: PGP signature

Re: CVS commit: othersrc/usr.bin/tnftp/libnetbsd

[Christos Zoulas]

In article <20130320073000.273cf17...@cvs.netbsd.org>,
Luke Mewburn  wrote:
>-=-=-=-=-=-
>
>Module Name:   othersrc
>Committed By:  lukem
>Date:  Wed Mar 20 07:29:59 UTC 2013
>
>Modified Files:
>   othersrc/usr.bin/tnftp/libnetbsd: glob.c
>
>Log Message:
>Remove some unportable assumptions that crept in in rev 1.9:
>* Just include "tnftp.h" instead of all the system headers
>* Restore a fix for AIX 4.1.5
>* Use "unsigned char" instead of "u_char" (reinstate part of rev 1.7)

Please change those in libc, so that it does not happen again:
(u_foo).

christos

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Wed Jan 13 00:07:30 UTC 2010

Modified Files:
othersrc/usr.bin/tnftp: NEWS

Log Message:
belated entry for 20100108


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 othersrc/usr.bin/tnftp/NEWS

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Tue Jan 12 07:01:24 UTC 2010

Modified Files:
othersrc/usr.bin/tnftp: configure

Log Message:
regen for tnftp 20100108


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 othersrc/usr.bin/tnftp/configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Tue Jan 12 07:01:01 UTC 2010

Modified Files:
othersrc/usr.bin/tnftp: COPYING

Log Message:
crank copyright years


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 othersrc/usr.bin/tnftp/COPYING

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Tue Jan 12 06:58:57 UTC 2010

Modified Files:
othersrc/usr.bin/tnftp: ChangeLog

Log Message:
release as tnftp 20100108
onoff() rename "bool" argument


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 othersrc/usr.bin/tnftp/ChangeLog

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Tue Jan 12 06:57:31 UTC 2010

Modified Files:
othersrc/usr.bin/tnftp: configure.ac

Log Message:
tnftp 20100108:
* Use sysconf(_SC_ARG_MAX) if ARG_MAX isn't defined.
* Fix LIBADD for libedit.
* Fix "make dist".


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 othersrc/usr.bin/tnftp/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp/src

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Tue Jan 12 06:55:47 UTC 2010

Modified Files:
othersrc/usr.bin/tnftp/src: cmds.c

Log Message:
rename argument "bool" to "val"


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 othersrc/usr.bin/tnftp/src/cmds.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Tue Jan  5 09:15:33 UTC 2010

Modified Files:
othersrc/usr.bin/tnftp: ChangeLog

Log Message:
ARG_MAX replacement.
libedit LIBADD libnetbsd.la


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 othersrc/usr.bin/tnftp/ChangeLog

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp/libnetbsd

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Tue Jan  5 09:08:29 UTC 2010

Modified Files:
othersrc/usr.bin/tnftp/libnetbsd: glob.c

Log Message:
If ARG_MAX isn't defined, use the result from sysconf(_SC_ARG_MAX).
Based on pkgsrc/net/tnftp.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 othersrc/usr.bin/tnftp/libnetbsd/glob.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp/libedit

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Tue Jan  5 07:23:48 UTC 2010

Modified Files:
othersrc/usr.bin/tnftp/libedit: Makefile.in

Log Message:
regen for LIBADD= libnetbsd.la


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 othersrc/usr.bin/tnftp/libedit/Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp/libedit

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Tue Jan  5 07:15:58 UTC 2010

Modified Files:
othersrc/usr.bin/tnftp/libedit: Makefile.am

Log Message:
Add libnetbsd.la to the LIBADD.
Fix provided by Adam Sampson.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 othersrc/usr.bin/tnftp/libedit/Makefile.am

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Mon Jan  4 06:29:09 UTC 2010

Modified Files:
othersrc/usr.bin/tnftp: ChangeLog

Log Message:
"make dist" improvements


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 othersrc/usr.bin/tnftp/ChangeLog

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Mon Jan  4 06:28:03 UTC 2010

Modified Files:
othersrc/usr.bin/tnftp: Makefile.in
othersrc/usr.bin/tnftp/libedit: Makefile.in
othersrc/usr.bin/tnftp/libnetbsd: Makefile.in
othersrc/usr.bin/tnftp/src: Makefile.in

Log Message:
regenerate for EXTRA_DIST


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 othersrc/usr.bin/tnftp/Makefile.in
cvs rdiff -u -r1.5 -r1.6 othersrc/usr.bin/tnftp/libedit/Makefile.in
cvs rdiff -u -r1.6 -r1.7 othersrc/usr.bin/tnftp/libnetbsd/Makefile.in
cvs rdiff -u -r1.9 -r1.10 othersrc/usr.bin/tnftp/src/Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp/libedit

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Mon Jan  4 06:26:58 UTC 2010

Modified Files:
othersrc/usr.bin/tnftp/libedit: Makefile.am

Log Message:
Distribute various files not shipped by default automake rules.
Use " $(SHELL) ./makelist" instead of "sh makelist".


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 othersrc/usr.bin/tnftp/libedit/Makefile.am

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Mon Jan  4 06:24:58 UTC 2010

Modified Files:
othersrc/usr.bin/tnftp: Makefile.am

Log Message:
Distribute various files not shipped by default automake rules.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 othersrc/usr.bin/tnftp/Makefile.am

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Mon Jan  4 06:24:20 UTC 2010

Modified Files:
othersrc/usr.bin/tnftp/libnetbsd: Makefile.am
othersrc/usr.bin/tnftp/src: Makefile.am

Log Message:
Distribute various files not shipped by default automake rules.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 othersrc/usr.bin/tnftp/libnetbsd/Makefile.am
cvs rdiff -u -r1.1 -r1.2 othersrc/usr.bin/tnftp/src/Makefile.am

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: othersrc/usr.bin/tnftp/src

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Mon Jan  4 06:10:44 UTC 2010

Removed Files:
othersrc/usr.bin/tnftp/src: ftp.cat1

Log Message:
Remove obsolete formatted man page.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r0 othersrc/usr.bin/tnftp/src/ftp.cat1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Re: CVS commit: othersrc/usr.bin/tnftp/src

[Luke Mewburn]

On Sat, May 23, 2009 at 04:39:43AM +0200, Joerg Sonnenberger wrote:
  | On Wed, May 20, 2009 at 12:15:25PM +, Luke Mewburn wrote:
  | > * Add epsv6 and epsv to disable extended passive mode for ipv6 or both 
ipv4
  | >   and ipv6 respectively.  This hack is due to our friends a Juniper 
Networks
  | >   who break epsv in ipv6.  Should be fixed in ScreenOS 6.2.X.
  | 
  | Do you have a test setup for this?

No, I don't.

I didn't make the original change to usr.bin/ftp either; see 
   http://mail-index.netbsd.org/source-changes/2008/05/10/msg006106.html
for the original commit message.


pgpqFR0rJjwAW.pgp
Description: PGP signature

Re: CVS commit: othersrc/usr.bin/tnftp/src

[Joerg Sonnenberger]

On Wed, May 20, 2009 at 12:15:25PM +, Luke Mewburn wrote:
> * Add epsv6 and epsv to disable extended passive mode for ipv6 or both ipv4
>   and ipv6 respectively.  This hack is due to our friends a Juniper Networks
>   who break epsv in ipv6.  Should be fixed in ScreenOS 6.2.X.

Do you have a test setup for this?

Joerg