diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-04-30 10:37:59 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-05-02 09:56:48 +0200 |
| commit | bf76d5fe76f413a1936d903caec0d4e600995ce0 (patch) | |
| tree | 18920e4798a20ffe7bb7ef6ab9df66441772620c | |
| parent | ftpfs: Always build FTP client (diff) | |
| download | rtems-bf76d5fe76f413a1936d903caec0d4e600995ce0.tar.bz2 | |
network: Import latest <arpa/ftp.h> from FreeBSD
Update #3419.
| -rw-r--r-- | cpukit/headers.am | 4 | ||||
| -rw-r--r-- | cpukit/include/arpa/ftp.h (renamed from cpukit/libnetworking/arpa/ftp.h) | 12 | ||||
| -rw-r--r-- | cpukit/libnetworking/headers.am | 1 |
3 files changed, 10 insertions, 7 deletions
diff --git a/cpukit/headers.am b/cpukit/headers.am index 66efcb5c58..2315db1e7d 100644 --- a/cpukit/headers.am +++ b/cpukit/headers.am @@ -22,6 +22,10 @@ include_HEADERS += include/xz.h include_HEADERS += include/zconf.h include_HEADERS += include/zlib.h +include_arpadir = $(includedir)/arpa +include_arpa_HEADERS = +include_arpa_HEADERS += include/arpa/ftp.h + include_dev_i2cdir = $(includedir)/dev/i2c include_dev_i2c_HEADERS = include_dev_i2c_HEADERS += include/dev/i2c/eeprom.h diff --git a/cpukit/libnetworking/arpa/ftp.h b/cpukit/include/arpa/ftp.h index 9a36488540..4f23e1ca40 100644 --- a/cpukit/libnetworking/arpa/ftp.h +++ b/cpukit/include/arpa/ftp.h @@ -1,4 +1,6 @@ -/* +/*- + * SPDX-License-Identifier: BSD-3-Clause + * * Copyright (c) 1983, 1989, 1993 * The Regents of the University of California. All rights reserved. * @@ -10,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -31,6 +29,8 @@ * SUCH DAMAGE. * * @(#)ftp.h 8.1 (Berkeley) 6/2/93 + * + * $FreeBSD: head/include/arpa/ftp.h 326024 2017-11-20 19:45:28Z pfg $ */ #ifndef _ARPA_FTP_H_ diff --git a/cpukit/libnetworking/headers.am b/cpukit/libnetworking/headers.am index 93dce6ef8f..b558d4b416 100644 --- a/cpukit/libnetworking/headers.am +++ b/cpukit/libnetworking/headers.am @@ -10,7 +10,6 @@ include_HEADERS += resolv.h include_arpadir = $(includedir)/arpa include_arpa_HEADERS = -include_arpa_HEADERS += arpa/ftp.h include_arpa_HEADERS += arpa/nameser.h include_arpa_HEADERS += arpa/nameser_compat.h |