aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGavin Atkinson <gavin@FreeBSD.org>2014-12-05 22:37:56 +0000
committerGavin Atkinson <gavin@FreeBSD.org>2014-12-05 22:37:56 +0000
commitfaf4814606d432aaa129677e45c357193b960ab9 (patch)
tree85bb4aa24b1ea15d6b08db8f6a2b5c5b7c02ee61
parent231644e0d5db221f70bf279e80bd3435a5f2d89d (diff)
downloadsrc-faf4814606d432aaa129677e45c357193b960ab9.tar.gz
src-faf4814606d432aaa129677e45c357193b960ab9.zip
Import tnftp-20141104.vendor/tnftp/20141104
Notes
Notes: svn path=/vendor/tnftp/dist/; revision=275528 svn path=/vendor/tnftp/20141104/; revision=275529; tag=vendor/tnftp/20141104
-rw-r--r--ChangeLog12
-rw-r--r--NEWS8
-rwxr-xr-xconfigure27
-rw-r--r--configure.ac11
-rw-r--r--tnftp.h5
-rw-r--r--tnftp_config.h.in3
6 files changed, 44 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index 9a73a1825ddc..3705df3e23a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,16 @@
-$NetBSD: ChangeLog,v 1.63 2014/10/31 04:13:56 lukem Exp $
+$NetBSD: ChangeLog,v 1.66 2014/11/03 21:48:49 lukem Exp $
+Mon Nov 3 21:43:20 UTC 2014 lukem
+
+ * Release as "tnftp 20141104".
+
+Fri Oct 31 08:32:28 UTC 2014 lukem
+
+ * Use '=' not '==' with test in configure.
+
+ * Check for <sys/uio.h> for writev() declaration.
+
Fri Oct 31 04:07:38 UTC 2014 lukem
* Release as "tnftp 20141031".
diff --git a/NEWS b/NEWS
index 108fffedb395..b08000689eb7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
-$NetBSD: NEWS,v 1.10 2014/10/31 04:06:54 lukem Exp $
+$NetBSD: NEWS,v 1.11 2014/11/03 21:48:49 lukem Exp $
-This is tnftp version 20141031.
+This is tnftp version 20141104.
+
+Changes in tnftp from 20141031 to 20141104:
+
+ Portability fixes.
Changes in tnftp from 20130505 to 20141031:
diff --git a/configure b/configure
index 5ebabe7665b9..f518841d6aa2 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.ac Revision: 1.26 .
+# From configure.ac Revision: 1.29 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for tnftp 20141031.
+# Generated by GNU Autoconf 2.69 for tnftp 20141104.
#
# Report bugs to <lukem@NetBSD.org>.
#
@@ -596,8 +596,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='tnftp'
PACKAGE_TARNAME='tnftp'
-PACKAGE_VERSION='20141031'
-PACKAGE_STRING='tnftp 20141031'
+PACKAGE_VERSION='20141104'
+PACKAGE_STRING='tnftp 20141104'
PACKAGE_BUGREPORT='lukem@NetBSD.org'
PACKAGE_URL=''
@@ -1333,7 +1333,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 20141031 to adapt to many kinds of systems.
+\`configure' configures tnftp 20141104 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1403,7 +1403,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of tnftp 20141031:";;
+ short | recursive ) echo "Configuration of tnftp 20141104:";;
esac
cat <<\_ACEOF
@@ -1518,7 +1518,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-tnftp configure 20141031
+tnftp configure 20141104
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2103,7 +2103,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 20141031, which was
+It was created by tnftp $as_me 20141104, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3067,7 +3067,7 @@ fi
# Define the identity of the package.
PACKAGE='tnftp'
- VERSION='20141031'
+ VERSION='20141104'
cat >>confdefs.h <<_ACEOF
@@ -12277,7 +12277,7 @@ rm -f core conftest.err conftest.$ac_objext \
if test "$with_ssl" != no; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: --with-ssl=$with_ssl; checking for required OpenSSL features" >&5
$as_echo "$as_me: --with-ssl=$with_ssl; checking for required OpenSSL features" >&6;}
- if test "$have_ssl" == yes; then :
+ if test "$have_ssl" = yes; then :
$as_echo "#define WITH_SSL 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: enabling SSL support" >&5
@@ -12383,7 +12383,8 @@ accheck_includes='
' # accheck_includes
for ac_header in sys/types.h sys/ioctl.h sys/param.h sys/stat.h \
- sys/socket.h sys/syslimits.h sys/time.h sys/wait.h
+ sys/socket.h sys/syslimits.h sys/time.h sys/uio.h \
+ sys/wait.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$accheck_includes
@@ -15274,7 +15275,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# 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 20141031, which was
+This file was extended by tnftp $as_me 20141104, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15340,7 +15341,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 20141031
+tnftp config.status 20141104
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 6c30f7595a96..c06533bd801e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,15 +1,15 @@
-# $NetBSD: configure.ac,v 1.26 2014/10/31 04:03:54 lukem Exp $
+# $NetBSD: configure.ac,v 1.29 2014/11/03 21:48:49 lukem Exp $
#
# Process this file with autoconf to produce a configure script.
-AC_INIT([tnftp], [20141031], [lukem@NetBSD.org])
+AC_INIT([tnftp], [20141104], [lukem@NetBSD.org])
AC_PREREQ([2.69])
AC_COPYRIGHT([
Copyright (c) 1999-2014 The NetBSD Foundation, Inc.
All rights reserved.
])
-AC_REVISION([$Revision: 1.26 $])
+AC_REVISION([$Revision: 1.29 $])
AS_SHELL_SANITIZE()
@@ -140,7 +140,7 @@ AX_CHECK_OPENSSL([have_ssl=yes])
AS_IF([test "$with_ssl" != no],
[AC_MSG_NOTICE([--with-ssl=$with_ssl; checking for required OpenSSL features])
- AS_IF([test "$have_ssl" == yes],
+ AS_IF([test "$have_ssl" = yes],
[AC_DEFINE([WITH_SSL], [1])
AC_MSG_NOTICE([enabling SSL support])
with_ssl=yes],
@@ -229,7 +229,8 @@ accheck_includes='
' # accheck_includes
AC_CHECK_HEADERS([sys/types.h sys/ioctl.h sys/param.h sys/stat.h \
- sys/socket.h sys/syslimits.h sys/time.h sys/wait.h],
+ sys/socket.h sys/syslimits.h sys/time.h sys/uio.h \
+ sys/wait.h],
[], [], [$accheck_includes])
AC_HEADER_DIRENT()
AC_HEADER_RESOLV()
diff --git a/tnftp.h b/tnftp.h
index 2b37d3eec158..85619efd3da4 100644
--- a/tnftp.h
+++ b/tnftp.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tnftp.h,v 1.35 2013/05/05 13:17:05 lukem Exp $ */
+/* $NetBSD: tnftp.h,v 1.36 2014/10/31 07:22:03 lukem Exp $ */
#define FTP_PRODUCT PACKAGE_NAME
#define FTP_VERSION PACKAGE_VERSION
@@ -70,6 +70,9 @@
# include <ndir.h>
# endif
#endif
+#if defined(HAVE_SYS_UIO_H)
+# include <sys/uio.h>
+#endif
#if defined(HAVE_SYS_IOCTL_H)
# include <sys/ioctl.h>
diff --git a/tnftp_config.h.in b/tnftp_config.h.in
index 0e5296d1a3b6..45eefc3d66c9 100644
--- a/tnftp_config.h.in
+++ b/tnftp_config.h.in
@@ -388,6 +388,9 @@
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
+/* Define to 1 if you have the <sys/uio.h> header file. */
+#undef HAVE_SYS_UIO_H
+
/* Define to 1 if you have the <sys/wait.h> header file. */
#undef HAVE_SYS_WAIT_H