Date: Fri, 5 Dec 2014 22:37:56 +0000 (UTC) From: Gavin Atkinson <gavin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r275528 - vendor/tnftp/dist Message-ID: <201412052237.sB5Mbuph081811@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gavin Date: Fri Dec 5 22:37:56 2014 New Revision: 275528 URL: https://svnweb.freebsd.org/changeset/base/275528 Log: Import tnftp-20141104. Modified: vendor/tnftp/dist/ChangeLog vendor/tnftp/dist/NEWS vendor/tnftp/dist/configure vendor/tnftp/dist/configure.ac vendor/tnftp/dist/tnftp.h vendor/tnftp/dist/tnftp_config.h.in Modified: vendor/tnftp/dist/ChangeLog ============================================================================== --- vendor/tnftp/dist/ChangeLog Fri Dec 5 22:35:28 2014 (r275527) +++ vendor/tnftp/dist/ChangeLog Fri Dec 5 22:37:56 2014 (r275528) @@ -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". Modified: vendor/tnftp/dist/NEWS ============================================================================== --- vendor/tnftp/dist/NEWS Fri Dec 5 22:35:28 2014 (r275527) +++ vendor/tnftp/dist/NEWS Fri Dec 5 22:37:56 2014 (r275528) @@ -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: Modified: vendor/tnftp/dist/configure ============================================================================== --- vendor/tnftp/dist/configure Fri Dec 5 22:35:28 2014 (r275527) +++ vendor/tnftp/dist/configure Fri Dec 5 22:37:56 2014 (r275528) @@ -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_obj 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_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 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\\" Modified: vendor/tnftp/dist/configure.ac ============================================================================== --- vendor/tnftp/dist/configure.ac Fri Dec 5 22:35:28 2014 (r275527) +++ vendor/tnftp/dist/configure.ac Fri Dec 5 22:37:56 2014 (r275528) @@ -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() Modified: vendor/tnftp/dist/tnftp.h ============================================================================== --- vendor/tnftp/dist/tnftp.h Fri Dec 5 22:35:28 2014 (r275527) +++ vendor/tnftp/dist/tnftp.h Fri Dec 5 22:37:56 2014 (r275528) @@ -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> Modified: vendor/tnftp/dist/tnftp_config.h.in ============================================================================== --- vendor/tnftp/dist/tnftp_config.h.in Fri Dec 5 22:35:28 2014 (r275527) +++ vendor/tnftp/dist/tnftp_config.h.in Fri Dec 5 22:37:56 2014 (r275528) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412052237.sB5Mbuph081811>