Merge gnu cpio 2.6 -> 2.8 changes. Unfortunately, we have massive

conflicts due to radically different approaches to security and bug fixes.
In some cases I re-started from the vendor version and reimplemented our
patches.  Fortunately, this is not enabled by default in -current.

2 files changed, 585 insertions, 48 deletions

diff --git a/gnu/usr.bin/cpio/Makefile b/gnu/usr.bin/cpio/Makefile
index 96ac02a..60756ef 100644
--- a/gnu/usr.bin/cpio/Makefile
+++ b/gnu/usr.bin/cpio/Makefile
@@ -25,6 +25,7 @@ SRCS=   copyin.c \
 	argp-fs-xinl.c \
 	argp-help.c \
 	argp-parse.c \
+	argp-pin.c \
 	argp-pv.c \
 	argp-pvh.c \
 	argp-xinl.c \
@@ -32,10 +33,17 @@ SRCS=   copyin.c \
 	dirname.c \
 	error.c \
 	exitfail.c \
+	fatal.c \
 	full-write.c \
 	getopt.c \
 	getopt1.c \
+	hash.c \
 	mempcpy.c \
+	paxerror.c \
+	paxexit.c \
+	paxnames.c \
+	quote.c \
+	quotearg.c \
 	rtapelib.c \
 	safe-read.c \
 	safe-write.c \
@@ -43,8 +51,11 @@ SRCS=   copyin.c \
 	stripslash.c \
 	strndup.c \
 	strnlen.c \
+	umaxtostr.c \
+	utimens.c \
 	xalloc-die.c \
 	xmalloc.c \
+	xstrndup.c \
 	alloca.h \
 	getopt.h
 
@@ -56,8 +67,8 @@ getopt.h: getopt_.h
 alloca.h: alloca_.h
 	ln -fs ${.ALLSRC} ${.TARGET}
 
-CFLAGS+=-I${.OBJDIR} -I${.CURDIR} -I${CPIODIR}/lib -DHAVE_CONFIG_H \
-	-DHAVE_MKFIFO -DHAVE_SETLOCALE -DHAVE_LSTAT
+CFLAGS+=-I${.OBJDIR} -I${.CURDIR} -I${CPIODIR}/lib -I${CPIODIR}/src \
+	-DHAVE_CONFIG_H -DHAVE_MKFIFO -DHAVE_SETLOCALE -DHAVE_LSTAT
 
 gcpio.1: ${CPIODIR}/doc/cpio.1
 	cat ${CPIODIR}/doc/cpio.1 >gcpio.1
diff --git a/gnu/usr.bin/cpio/config.h b/gnu/usr.bin/cpio/config.h
index 133e5ad..36a88f0 100644
--- a/gnu/usr.bin/cpio/config.h
+++ b/gnu/usr.bin/cpio/config.h
@@ -1,10 +1,73 @@
 /* $FreeBSD$ */
 
-/* config.h.  Generated by configure.  */
+/* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* Define to 1 if the `closedir' function returns void instead of `int'. */
-/* #undef CLOSEDIR_VOID */
+/* Define this to an absolute name of <dirent.h>. */
+/* #undef ABSOLUTE_DIRENT_H */
+
+/* Define this to an absolute name of <fcntl.h>. */
+#define ABSOLUTE_FCNTL_H "///usr/include/fcntl.h"
+
+/* Define this to an absolute name of <float.h>. */
+/* #undef ABSOLUTE_FLOAT_H */
+
+/* Define this to an absolute name of <inttypes.h>. */
+#define ABSOLUTE_INTTYPES_H "///usr/include/inttypes.h"
+
+/* Define this to an absolute name of <stdint.h>. */
+#define ABSOLUTE_STDINT_H "///usr/include/stdint.h"
+
+/* Define this to an absolute name of <stdio.h>. */
+#define ABSOLUTE_STDIO_H "///usr/include/stdio.h"
+
+/* Define this to an absolute name of <stdlib.h>. */
+#define ABSOLUTE_STDLIB_H "///usr/include/stdlib.h"
+
+/* Define this to an absolute name of <string.h>. */
+#define ABSOLUTE_STRING_H "///usr/include/string.h"
+
+/* Define this to an absolute name of <sysexits.h>. */
+#define ABSOLUTE_SYSEXITS_H "///usr/include/sysexits.h"
+
+/* Define this to an absolute name of <sys/stat.h>. */
+#define ABSOLUTE_SYS_STAT_H "///usr/include/sys/stat.h"
+
+/* Define this to an absolute name of <sys/time.h>. */
+#define ABSOLUTE_SYS_TIME_H "///usr/include/sys/time.h"
+
+/* Define this to an absolute name of <time.h>. */
+#define ABSOLUTE_TIME_H "///usr/include/time.h"
+
+/* Define this to an absolute name of <unistd.h>. */
+#define ABSOLUTE_UNISTD_H "///usr/include/unistd.h"
+
+/* Define this to an absolute name of <wchar.h>. */
+/* #undef ABSOLUTE_WCHAR_H */
+
+/* Define this to an absolute name of <wctype.h>. */
+#define ABSOLUTE_WCTYPE_H "///usr/include/wctype.h"
+
+/* Define to the number of bits in type 'ptrdiff_t'. */
+/* #undef BITSIZEOF_PTRDIFF_T */
+
+/* Define to the number of bits in type 'sig_atomic_t'. */
+/* #undef BITSIZEOF_SIG_ATOMIC_T */
+
+/* Define to the number of bits in type 'size_t'. */
+/* #undef BITSIZEOF_SIZE_T */
+
+/* Define to the number of bits in type 'wchar_t'. */
+/* #undef BITSIZEOF_WCHAR_T */
+
+/* Define to the number of bits in type 'wint_t'. */
+/* #undef BITSIZEOF_WINT_T */
+
+/* Define if chown is not POSIX compliant regarding IDs of -1. */
+/* #undef CHOWN_FAILS_TO_HONOR_ID_OF_NEGATIVE_ONE */
+
+/* Define if chown modifies symlinks. */
+/* #undef CHOWN_MODIFIES_SYMLINK */
 
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems.
@@ -17,10 +80,32 @@
 /* Define full file name of rmt program. */
 #define DEFAULT_RMT_COMMAND "/etc/rmt"
 
+/* the name of the file descriptor member of DIR */
+/* #undef DIR_FD_MEMBER_NAME */
+
+#ifdef DIR_FD_MEMBER_NAME
+# define DIR_TO_FD(Dir_p) ((Dir_p)->DIR_FD_MEMBER_NAME)
+#else
+# define DIR_TO_FD(Dir_p) -1
+#endif
+
+
+/* Define to 1 if // is a file system root distinct from /. */
+/* #undef DOUBLE_SLASH_IS_DISTINCT_ROOT */
+
+/* Define if struct dirent has a member d_ino that actually works. */
+#define D_INO_IN_DIRENT 1
+
 /* Define to 1 if translation of program messages to the user's native
    language is requested. */
 /* #undef ENABLE_NLS */
 
+/* Define as good substitute value for EOVERFLOW. */
+/* #undef EOVERFLOW */
+
+/* Define if gnulib's fchdir() replacement is used. */
+/* #undef FCHDIR_REPLACEMENT */
+
 /* Define on systems for which file names may have a so-called `drive letter'
    prefix, define this to compute the length of that prefix, including the
    colon. */
@@ -30,26 +115,64 @@
    separator. */
 #define FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR 0
 
-#if FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX
-# define FILE_SYSTEM_PREFIX_LEN(Filename) \
-  ((Filename)[0] && (Filename)[1] == ':' ? 2 : 0)
-#else
-# define FILE_SYSTEM_PREFIX_LEN(Filename) 0
-#endif
+/* Define if a drive letter prefix denotes a relative path if it is not
+   followed by a file name component separator. */
+#define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 0
 
-/* Define to 1 if you have `alloca', as a function or macro. */
-#define HAVE_ALLOCA 1
+/* Define if gettimeofday clobbers the localtime buffer. */
+/* #undef GETTIMEOFDAY_CLOBBERS_LOCALTIME */
 
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+/* Define to 1 when using the gnulib module close-stream. */
+#define GNULIB_CLOSE_STREAM 1
+
+/* Define to 1 when using the gnulib module fcntl-safer. */
+#define GNULIB_FCNTL_SAFER 1
+
+/* Define to 1 to add extern declaration of program_invocation_name to argp.h
    */
-#define HAVE_ALLOCA_H 1
+#define GNULIB_PROGRAM_INVOCATION_NAME 1
 
-/* Define to 1 if you have the `bcopy' function. */
-#define HAVE_BCOPY 1
+/* Define to 1 to add extern declaration of program_invocation_short_name to
+   argp.h */
+#define GNULIB_PROGRAM_INVOCATION_SHORT_NAME 1
+
+/* Define to 1 if you have the `alarm' function. */
+#define HAVE_ALARM 1
+
+/* Define to 1 if you have 'alloca' after including <alloca.h>, a header that
+   may be supplied by this distribution. */
+#define HAVE_ALLOCA 1
+
+/* Define HAVE_ALLOCA_H for backward compatibility with older code that
+   includes <alloca.h> only if HAVE_ALLOCA_H is defined. */
+#define HAVE_ALLOCA_H 1
 
 /* Define to 1 if you have the `btowc' function. */
 #define HAVE_BTOWC 1
 
+/* Define to 1 if you have the `canonicalize_file_name' function. */
+/* #undef HAVE_CANONICALIZE_FILE_NAME */
+
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+   CoreFoundation framework. */
+/* #undef HAVE_CFLOCALECOPYCURRENT */
+
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
+   the CoreFoundation framework. */
+/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
+
+/* Define to 1 if your system has a working `chown' function. */
+#define HAVE_CHOWN 1
+
+/* Define to 1 if you have the `clock_gettime' function. */
+#define HAVE_CLOCK_GETTIME 1
+
+/* Define to 1 if you have the `clock_settime' function. */
+#define HAVE_CLOCK_SETTIME 1
+
+/* Define if you have compound literals. */
+/* #undef HAVE_COMPOUND_LITERALS */
+
 /* Define if the GNU dcgettext() function is already present or preinstalled.
    */
 /* #undef HAVE_DCGETTEXT */
@@ -58,10 +181,18 @@
    */
 #define HAVE_DECL_ATOI 1
 
+/* Define to 1 if you have the declaration of `canonicalize_file_name', and to
+   0 if you don't. */
+#define HAVE_DECL_CANONICALIZE_FILE_NAME 0
+
 /* Define to 1 if you have the declaration of `clearerr_unlocked', and to 0 if
    you don't. */
 #define HAVE_DECL_CLEARERR_UNLOCKED 1
 
+/* Define to 1 if you have the declaration of `dirfd', and to 0 if you don't.
+   */
+#define HAVE_DECL_DIRFD 1
+
 /* Define to 1 if you have the declaration of `errno', and to 0 if you don't.
    */
 #define HAVE_DECL_ERRNO 1
@@ -106,6 +237,10 @@
    you don't. */
 #define HAVE_DECL_GETCHAR_UNLOCKED 1
 
+/* Define to 1 if you have the declaration of `getcwd', and to 0 if you don't.
+   */
+#define HAVE_DECL_GETCWD 1
+
 /* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
    don't. */
 #define HAVE_DECL_GETC_UNLOCKED 1
@@ -126,13 +261,35 @@
    don't. */
 #define HAVE_DECL_GETPWNAM 1
 
-/* Define to 1 if you have the declaration of `program_invocation_name', and
-   to 0 if you don't. */
-#define HAVE_DECL_PROGRAM_INVOCATION_NAME 0
+/* Define to 1 if you have the declaration of `imaxabs', and to 0 if you
+   don't. */
+#define HAVE_DECL_IMAXABS 1
+
+/* Define to 1 if you have the declaration of `imaxdiv', and to 0 if you
+   don't. */
+#define HAVE_DECL_IMAXDIV 1
 
-/* Define to 1 if you have the declaration of `program_invocation_short_name',
-   and to 0 if you don't. */
-#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME 0
+/* Define to 1 if you have the declaration of `isblank', and to 0 if you
+   don't. */
+#define HAVE_DECL_ISBLANK 1
+
+/* Define to 1 if you have the declaration of `lchown', and to 0 if you don't.
+   */
+#define HAVE_DECL_LCHOWN 1
+
+/* Define to 1 if you have the declaration of `memrchr', and to 0 if you
+   don't. */
+#define HAVE_DECL_MEMRCHR 0
+
+/* Define to 1 if you have the declaration of `mkdir', and to 0 if you don't.
+   */
+#define HAVE_DECL_MKDIR 1
+
+/* Define if program_invocation_name is declared */
+/* #undef HAVE_DECL_PROGRAM_INVOCATION_NAME */
+
+/* Define if program_invocation_short_name is declared */
+/* #undef HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME */
 
 /* Define to 1 if you have the declaration of `putchar_unlocked', and to 0 if
    you don't. */
@@ -154,60 +311,133 @@
    don't. */
 #define HAVE_DECL_STRERROR_R 1
 
+/* Define to 1 if you have the declaration of `strncasecmp', and to 0 if you
+   don't. */
+#define HAVE_DECL_STRNCASECMP 1
+
+/* Define to 1 if you have the declaration of `strndup', and to 0 if you
+   don't. */
+#define HAVE_DECL_STRNDUP 0
+
 /* Define to 1 if you have the declaration of `strnlen', and to 0 if you
    don't. */
 #define HAVE_DECL_STRNLEN 0
 
-/* Define to 1 if you have the declaration of `sys_errlist', and to 0 if you
+/* Define to 1 if you have the declaration of `strtoimax', and to 0 if you
    don't. */
-#define HAVE_DECL_SYS_ERRLIST 1
+#define HAVE_DECL_STRTOIMAX 1
 
-/* Define to 1 if you have the declaration of `sys_nerr', and to 0 if you
+/* Define to 1 if you have the declaration of `strtoumax', and to 0 if you
    don't. */
-#define HAVE_DECL_SYS_NERR 1
+#define HAVE_DECL_STRTOUMAX 1
 
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
    */
+/* #undef HAVE_DECL_TZNAME */
+
+/* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you
+   don't. */
+#define HAVE_DECL_VSNPRINTF 1
+
+/* Define to 1 if you have the declaration of `__fpending', and to 0 if you
+   don't. */
+#define HAVE_DECL___FPENDING 0
+
+/* Define to 1 if you have the <dirent.h> header file. */
 #define HAVE_DIRENT_H 1
 
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-/* #undef HAVE_DOPRNT */
+/* Define to 1 if you have the `dirfd' function. */
+/* #undef HAVE_DIRFD */
+
+/* Define to 1 if you have the `dup2' function. */
+#define HAVE_DUP2 1
+
+/* Define if you have the declaration of environ. */
+/* #undef HAVE_ENVIRON_DECL */
 
-/* Define to 1 if you have the `endgrent' function. */
-#define HAVE_ENDGRENT 1
+/* Define to 1 if you have the `fchdir' function. */
+#define HAVE_FCHDIR 1
 
-/* Define to 1 if you have the `endpwent' function. */
-#define HAVE_ENDPWENT 1
+/* Define to 1 if you have the `fchmod' function. */
+#define HAVE_FCHMOD 1
+
+/* Define to 1 if you have the `fchmodat' function. */
+/* #undef HAVE_FCHMODAT */
+
+/* Define to 1 if you have the `fchown' function. */
+#define HAVE_FCHOWN 1
 
 /* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H 1
 
+/* Define to 1 if you have the `fdopendir' function. */
+/* #undef HAVE_FDOPENDIR */
+
 /* Define to 1 if you have the <features.h> header file. */
 /* #undef HAVE_FEATURES_H */
 
+/* Define to 1 if you have the <float.h> header file. */
+#define HAVE_FLOAT_H 1
+
 /* Define to 1 if you have the `flockfile' function. */
 #define HAVE_FLOCKFILE 1
 
 /* Define to 1 if you have the `funlockfile' function. */
 #define HAVE_FUNLOCKFILE 1
 
+/* Define to 1 if you have the `futimes' function. */
+#define HAVE_FUTIMES 1
+
+/* Define to 1 if you have the `futimesat' function. */
+/* #undef HAVE_FUTIMESAT */
+
+/* Define to 1 if you have the `getcwd' function. */
+#define HAVE_GETCWD 1
+
 /* Define to 1 if you have the <getopt.h> header file. */
 #define HAVE_GETOPT_H 1
 
 /* Define to 1 if you have the `getopt_long_only' function. */
-/* #undef HAVE_GETOPT_LONG_ONLY */
+#define HAVE_GETOPT_LONG_ONLY 1
+
+/* Define to 1 if you have the `getpagesize' function. */
+#define HAVE_GETPAGESIZE 1
 
 /* Define if the GNU gettext() function is already present or preinstalled. */
 /* #undef HAVE_GETTEXT */
 
-/* Define if you have the iconv() function. */
+/* Define to 1 if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY 1
+
+/* Define if you have the iconv() function and it works. */
 /* #undef HAVE_ICONV */
 
+/* Define to 1 if the compiler supports one of the keywords 'inline',
+   '__inline__', '__inline' and effectively inlines functions marked as such.
+   */
+#define HAVE_INLINE 1
+
+/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
+#define HAVE_INTMAX_T 1
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1
 
-/* Define to 1 if you have the `iswprint' function. */
-#define HAVE_ISWPRINT 1
+/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
+   declares uintmax_t. */
+#define HAVE_INTTYPES_H_WITH_UINTMAX 1
+
+/* Define to 1 if you have the <io.h> header file. */
+/* #undef HAVE_IO_H */
+
+/* Define to 1 if you have the `iswcntrl' function. */
+#define HAVE_ISWCNTRL 1
+
+/* Define to 1 if you have the `iswctype' function. */
+#define HAVE_ISWCTYPE 1
+
+/* Define to 1 if you have the `lchmod' function. */
+#define HAVE_LCHMOD 1
 
 /* Define to 1 if you have the `lchown' function. */
 #define HAVE_LCHOWN 1
@@ -221,6 +451,19 @@
 /* Define to 1 if you have the <locale.h> header file. */
 #define HAVE_LOCALE_H 1
 
+/* Define if you have the 'long long' type. */
+#define HAVE_LONG_LONG 1
+
+/* Define to 1 if the system has the type `long long int'. */
+#define HAVE_LONG_LONG_INT 1
+
+/* Define to 1 if you have the `lstat' function. */
+#define HAVE_LSTAT 1
+
+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
+   to 0 otherwise. */
+#define HAVE_MALLOC 1
+
 /* Define to 1 if mbrtowc and mbstate_t are properly declared. */
 #define HAVE_MBRTOWC 1
 
@@ -239,21 +482,103 @@
 /* Define to 1 if you have the `mempcpy' function. */
 /* #undef HAVE_MEMPCPY */
 
-/* Define to 1 if you have the `mkdir' function. */
-#define HAVE_MKDIR 1
+/* Define to 1 if you have the `memrchr' function. */
+/* #undef HAVE_MEMRCHR */
+
+/* Define to 1 if you have the `mkdirat' function. */
+/* #undef HAVE_MKDIRAT */
+
+/* Define to 1 if you have the `mkfifo' function. */
+#define HAVE_MKFIFO 1
+
+/* Define to 1 if you have the `nanotime' function. */
+/* #undef HAVE_NANOTIME */
 
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 /* #undef HAVE_NDIR_H */
 
+/* Define to 1 if you have the <netdb.h> header file. */
+#define HAVE_NETDB_H 1
+
+/* Define to 1 if you have the <net/errno.h> header file. */
+/* #undef HAVE_NET_ERRNO_H */
+
+/* Define to 1 if libc includes obstacks. */
+/* #undef HAVE_OBSTACK */
+
+/* Define to 1 if you have the `openat' function. */
+/* #undef HAVE_OPENAT */
+
+/* Define to 1 if getcwd works, except it sometimes fails when it shouldn't,
+   setting errno to ERANGE, ENAMETOOLONG, or ENOENT. If __GETCWD_PREFIX is not
+   defined, it doesn't matter whether HAVE_PARTLY_WORKING_GETCWD is defined.
+   */
+#define HAVE_PARTLY_WORKING_GETCWD 1
+
+/* Define to 1 if you have the `pipe' function. */
+#define HAVE_PIPE 1
+
+/* Define if program_invocation_name is defined */
+/* #undef HAVE_PROGRAM_INVOCATION_NAME */
+
+/* Define if program_invocation_short_name is defined */
+/* #undef HAVE_PROGRAM_INVOCATION_SHORT_NAME */
+
+/* Define to 1 if the system has the type `ptrdiff_t'. */
+#define HAVE_PTRDIFF_T 1
+
+/* Define to 1 if you have the `readlink' function. */
+#define HAVE_READLINK 1
+
+/* Define to 1 if you have the <search.h> header file. */
+/* #undef HAVE_SEARCH_H */
+
+/* Define to 1 if you have the `setenv' function. */
+#define HAVE_SETENV 1
+
+/* Define to 1 if you have the `setlocale' function. */
+#define HAVE_SETLOCALE 1
+
+/* Define to 1 if you have the <sgtty.h> header file. */
+/* #undef HAVE_SGTTY_H */
+
+/* Define to 1 if 'sig_atomic_t' is a signed integer type. */
+/* #undef HAVE_SIGNED_SIG_ATOMIC_T */
+
+/* Define to 1 if 'wchar_t' is a signed integer type. */
+/* #undef HAVE_SIGNED_WCHAR_T */
+
+/* Define to 1 if 'wint_t' is a signed integer type. */
+/* #undef HAVE_SIGNED_WINT_T */
+
+/* Define to 1 if you have the `sleep' function. */
+#define HAVE_SLEEP 1
+
+/* Define to 1 if you have the `snprintf' function. */
+#define HAVE_SNPRINTF 1
+
 /* Define to 1 if stdbool.h conforms to C99. */
 #define HAVE_STDBOOL_H 1
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
 
+/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
+   uintmax_t. */
+#define HAVE_STDINT_H_WITH_UINTMAX 1
+
+/* Define to 1 if you have the <stdio_ext.h> header file. */
+/* #undef HAVE_STDIO_EXT_H */
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#define HAVE_STDIO_H 1
+
 /* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
 
+/* Define to 1 if you have the `stpcpy' function. */
+#define HAVE_STPCPY 1
+
 /* Define to 1 if you have the `strcasecmp' function. */
 #define HAVE_STRCASECMP 1
 
@@ -278,12 +603,45 @@
 /* Define to 1 if you have the `strncasecmp' function. */
 #define HAVE_STRNCASECMP 1
 
-/* Define to 1 if you have the `strndup' function. */
+/* Define if you have the strndup() function and it works. */
 /* #undef HAVE_STRNDUP */
 
+/* Define to 1 if you have the `strtol' function. */
+#define HAVE_STRTOL 1
+
+/* Define to 1 if `st_blksize' is member of `struct stat'. */
+#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
+
+/* Define to 1 if `st_blocks' is member of `struct stat'. */
+#define HAVE_STRUCT_STAT_ST_BLOCKS 1
+
+/* Define to 1 if `tm_zone' is member of `struct tm'. */
+#define HAVE_STRUCT_TM_TM_ZONE 1
+
+/* Define if struct utimbuf is declared -- usually in <utime.h>. Some systems
+   have utime.h but don't declare the struct anywhere. */
+#define HAVE_STRUCT_UTIMBUF 1
+
+/* Define to 1 if your `struct stat' has `st_blksize'. Deprecated, use
+   `HAVE_STRUCT_STAT_ST_BLKSIZE' instead. */
+#define HAVE_ST_BLKSIZE 1
+
+/* Define to 1 if your `struct stat' has `st_blocks'. Deprecated, use
+   `HAVE_STRUCT_STAT_ST_BLOCKS' instead. */
+#define HAVE_ST_BLOCKS 1
+
 /* Define to 1 if you have the <sysexits.h> header file. */
 #define HAVE_SYSEXITS_H 1
 
+/* Define to 1 if you have the <sys/bitypes.h> header file. */
+/* #undef HAVE_SYS_BITYPES_H */
+
+/* Define to 1 if you have the <sys/buf.h> header file. */
+#define HAVE_SYS_BUF_H 1
+
+/* Define to 1 if you have the <sys/device.h> header file. */
+/* #undef HAVE_SYS_DEVICE_H */
+
 /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
    */
 /* #undef HAVE_SYS_DIR_H */
@@ -291,6 +649,15 @@
 /* Define if your system has sys_errlist global variable */
 #define HAVE_SYS_ERRLIST 1
 
+/* Define to 1 if you have the <sys/gentape.h> header file. */
+/* #undef HAVE_SYS_GENTAPE_H */
+
+/* Define to 1 if you have the <sys/inet.h> header file. */
+/* #undef HAVE_SYS_INET_H */
+
+/* Define to 1 if you have the <sys/inttypes.h> header file. */
+/* #undef HAVE_SYS_INTTYPES_H */
+
 /* Define to 1 if you have the <sys/io/trioctl.h> header file. */
 /* #undef HAVE_SYS_IO_TRIOCTL_H */
 
@@ -301,33 +668,83 @@
    */
 /* #undef HAVE_SYS_NDIR_H */
 
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
+/* Define to 1 if you have the <sys/tape.h> header file. */
+/* #undef HAVE_SYS_TAPE_H */
+
+/* Define to 1 if you have the <sys/timeb.h> header file. */
+/* #undef HAVE_SYS_TIMEB_H */
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/tprintf.h> header file. */
+/* #undef HAVE_SYS_TPRINTF_H */
+
 /* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1
 
 /* Define to 1 if you have the <sys/wait.h> header file. */
 #define HAVE_SYS_WAIT_H 1
 
+/* Define to 1 if you have the <time.h> header file. */
+#define HAVE_TIME_H 1
+
+/* Define if struct tm has the tm_gmtoff member. */
+#define HAVE_TM_GMTOFF 1
+
+/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
+   `HAVE_STRUCT_TM_TM_ZONE' instead. */
+#define HAVE_TM_ZONE 1
+
+/* Define to 1 if you have the `tsearch' function. */
+/* #undef HAVE_TSEARCH */
+
+/* Define to 1 if you don't have `tm_zone' but do have the external array
+   `tzname'. */
+/* #undef HAVE_TZNAME */
+
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 
+/* Define to 1 if you have the `unsetenv' function. */
+#define HAVE_UNSETENV 1
+
+/* Define to 1 if the system has the type `unsigned long long int'. */
+#define HAVE_UNSIGNED_LONG_LONG_INT 1
+
 /* Define to 1 if you have the <utime.h> header file. */
 #define HAVE_UTIME_H 1
 
 /* Define to 1 if you have the <utmp.h> header file. */
 #define HAVE_UTMP_H 1
 
-/* Define to 1 if you have the `vprintf' function. */
-#define HAVE_VPRINTF 1
+/* Define to 1 if you have the `vasnprintf' function. */
+/* #undef HAVE_VASNPRINTF */
+
+/* Define to 1 if you have the `vsnprintf' function. */
+#define HAVE_VSNPRINTF 1
 
 /* Define to 1 if you have the <wchar.h> header file. */
 #define HAVE_WCHAR_H 1
 
+/* Define if you have the 'wchar_t' type. */
+#define HAVE_WCHAR_T 1
+
+/* Define to 1 if you have the `wcslen' function. */
+#define HAVE_WCSLEN 1
+
 /* Define to 1 if you have the <wctype.h> header file. */
 #define HAVE_WCTYPE_H 1
 
+/* Define if you have the 'wint_t' type. */
+#define HAVE_WINT_T 1
+
 /* Define to 1 if you have the `wmemchr' function. */
 #define HAVE_WMEMCHR 1
 
@@ -337,15 +754,34 @@
 /* Define to 1 if you have the `wmempcpy' function. */
 /* #undef HAVE_WMEMPCPY */
 
+/* Define to 1 if O_NOATIME works. */
+#define HAVE_WORKING_O_NOATIME 0
+
+/* Define to 1 if O_NOFOLLOW works. */
+#define HAVE_WORKING_O_NOFOLLOW 1
+
+/* Define if utimes works properly. */
+#define HAVE_WORKING_UTIMES 1
+
 /* Define to 1 if the system has the type `_Bool'. */
 #define HAVE__BOOL 1
 
+/* Define to 1 if you have the `_ftime' function. */
+/* #undef HAVE__FTIME */
+
+/* Define to 1 if you have the `__fpending' function. */
+/* #undef HAVE___FPENDING */
+
 #if FILE_SYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
 #else
 # define ISSLASH(C) ((C) == '/')
 #endif
 
+/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
+   slash. */
+/* #undef LSTAT_FOLLOWS_SLASHED_SYMLINK */
+
 /* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
    */
 /* #undef MAJOR_IN_MKDEV */
@@ -354,6 +790,9 @@
    <sysmacros.h>. */
 /* #undef MAJOR_IN_SYSMACROS */
 
+/* If malloc(0) is != NULL, define this to 1. Otherwise define this to 0. */
+#define MALLOC_0_IS_NONNULL 1
+
 /* Define to mt_model (v.g., for DG/UX), else to mt_type. */
 #define MTIO_CHECK_FIELD mt_type
 
@@ -367,41 +806,86 @@
 #define PACKAGE_NAME "GNU cpio"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "GNU cpio 2.6-FreeBSD"
+#define PACKAGE_STRING "GNU cpio 2.8-FreeBSD"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "cpio"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.6-FreeBSD"
+#define PACKAGE_VERSION "2.8-FreeBSD"
+
+/* the number of pending output bytes on stream `fp' */
+#define PENDING_OUTPUT_N_BYTES fp->_p - fp->_bf._base
+
+/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
+/* #undef PRI_MACROS_BROKEN */
 
 /* Define to 1 if the C compiler supports function prototypes. */
 #define PROTOTYPES 1
 
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+   'ptrdiff_t'. */
+/* #undef PTRDIFF_T_SUFFIX */
+
+/* Define if vasnprintf exists but is overridden by gnulib. */
+/* #undef REPLACE_VASNPRINTF */
+
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
 
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+   'sig_atomic_t'. */
+/* #undef SIG_ATOMIC_T_SUFFIX */
+
+/* Define as the maximum value of type 'size_t', if the system doesn't define
+   it. */
+/* #undef SIZE_MAX */
+
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+   'size_t'. */
+/* #undef SIZE_T_SUFFIX */
+
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
+   automatically deduced at runtime.
 	STACK_DIRECTION > 0 => grows toward higher addresses
 	STACK_DIRECTION < 0 => grows toward lower addresses
 	STACK_DIRECTION = 0 => direction of growth unknown */
 /* #undef STACK_DIRECTION */
 
+/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
+/* #undef STAT_MACROS_BROKEN */
+
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Define to 1 if strerror_r returns char *. */
 /* #undef STRERROR_R_CHAR_P */
 
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
+
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+/* #undef TM_IN_SYS_TIME */
+
 /* Define to 1 if you want getc etc. to use unlocked I/O if available.
    Unlocked I/O can improve performance in unithreaded apps, but it is not
    safe for multithreaded apps. */
 #define USE_UNLOCKED_IO 1
 
 /* Version number of package */
-#define VERSION "2.6-FreeBSD"
+#define VERSION "2.8-FreeBSD"
+
+/* Define if unsetenv() returns void, not int. */
+/* #undef VOID_UNSETENV */
+
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+   'wchar_t'. */
+/* #undef WCHAR_T_SUFFIX */
+
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+   'wint_t'. */
+/* #undef WINT_T_SUFFIX */
 
 /* Define to 1 if on AIX 3.
    System headers sometimes define this.
@@ -435,35 +919,74 @@
 #ifndef __EXTENSIONS__
 # define __EXTENSIONS__ 1
 #endif
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
 
 /* Define to rpl_ if the getopt replacement functions and variables should be
    used. */
 #define __GETOPT_PREFIX rpl_
 
+/* Define to rpl_ if the openat replacement function should be used. */
+#define __OPENAT_PREFIX rpl_
+
 /* Define like PROTOTYPES; this can be used by system headers. */
 #define __PROTOTYPES 1
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
 
+/* Define to rpl_fchownat if the replacement function should be used. */
+#define fchownat rpl_fchownat
+
 /* Define to a replacement function name for fnmatch(). */
 /* #define fnmatch gnu_fnmatch */
 
 /* Define to `int' if <sys/types.h> does not define. */
 /* #undef gid_t */
 
+/* A replacement for va_copy, if needed.  */
+#define gl_va_copy(a,b) ((a) = (b))
+
+/* Define to rpl_gmtime if the replacement function should be used. */
+/* #undef gmtime */
+
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus
 /* #undef inline */
 #endif
 
+/* Define to long or long long if <stdint.h> and <inttypes.h> don't define. */
+/* #undef intmax_t */
+
+/* Define to rpl_localtime if the replacement function should be used. */
+/* #undef localtime */
+
+/* Define to rpl_malloc if the replacement function should be used. */
+/* #undef malloc */
+
 /* Define to a type if <wchar.h> does not define. */
 /* #undef mbstate_t */
 
+/* Define to rpl_mktime if the replacement function should be used. */
+#define mktime rpl_mktime
+
+/* Define to `long int' if <sys/types.h> does not define. */
+/* #undef off_t */
+
+/* Define to a replacement function name for realpath(). */
+#define realpath rpl_realpath
+
 /* Define to equivalent of C99 restrict keyword, or to nothing if this is not
    supported. Do not define if restrict is supported directly. */
-#define restrict __restrict
+/* #undef restrict */
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* #undef size_t */
 
 /* Define as a signed type of the same size as size_t. */
 /* #undef ssize_t */
@@ -473,3 +996,6 @@
 
 /* Define to `int' if <sys/types.h> doesn't define. */
 /* #undef uid_t */
+
+/* Define as a macro for copying va_list variables. */
+/* #undef va_copy */